First step of reorganizing admin module into namespaces

modules/admin/admin.admin.model.php

@@ -1,584 +1,17 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
- * adminAdminModel class
- * admin model class of admin module
- * @author NAVER (developers@xpressengine.com)
- * @package /modules/admin
- * @version 0.1
+ * Preserved for backward compatibility
+ * 
+ * @deprecated
  */
-class adminAdminModel extends admin
+class AdminAdminModel extends Admin
 {
-
-	/**
-	 * Ftp root path
-	 * @var string
-	 */
-	var $pwd;
-
-	/**
-	 * Buffer for Admin GNB menu
-	 * @var string
-	 */
-	var $gnbLangBuffer;
-
-	/**
-	 * Find XE installed path on sftp
-	 */
-	function getSFTPPath()
-	{
-		$ftp_info = Context::getRequestVars();
-
-		if(!$ftp_info->ftp_host)
-		{
-			$ftp_info->ftp_host = "127.0.0.1";
-		}
-
-		if(!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
-		{
-			$ftp_info->ftp_port = '22';
-		}
-
-		$connection = ssh2_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
-		if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
-		{
-			return $this->setError('msg_ftp_invalid_auth_info');
-		}
-		$sftp = ssh2_sftp($connection);
-
-		// create temp file
-		$pin = $_SERVER['REQUEST_TIME'];
-		FileHandler::writeFile('./files/cache/ftp_check', $pin);
-
-		// create path candidate
-		$xe_path = RX_BASEDIR;
-		$path_info = array_reverse(explode('/', RX_BASEDIR));
-		array_pop($path_info); // remove last '/'
-		$path_candidate = array();
-
-		$temp = '';
-		foreach($path_info as $path)
-		{
-			$temp = '/' . $path . $temp;
-			$path_candidate[] = $temp;
-		}
-
-		// try
-		foreach($path_candidate as $path)
-		{
-			// upload check file
-			if(!@ssh2_scp_send($connection, FileHandler::getRealPath('./files/cache/ftp_check'), $path . 'ftp_check.html'))
-			{
-				continue;
-			}
-
-			// get check file
-			$result = FileHandler::getRemoteResource(getNotencodedFullUrl() . 'ftp_check.html');
-
-			// delete temp check file
-			@ssh2_sftp_unlink($sftp, $path . 'ftp_check.html');
-
-			// found
-			if($result == $pin)
-			{
-				$found_path = $path;
-				break;
-			}
-		}
-
-		FileHandler::removeFile('./files/cache/ftp_check', $pin);
-
-		if($found_path)
-		{
-			$this->add('found_path', $found_path);
-		}
-	}
-
-	function getFTPPath()
-	{
-		$ftp_info = Context::getRequestVars();
-
-		if(!$ftp_info->ftp_host)
-		{
-			$ftp_info->ftp_host = "127.0.0.1";
-		}
-
-		if(!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
-		{
-			$ftp_info->ftp_port = '22';
-		}
-
-		$connection = ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
-		if(!$connection)
-		{
-			return $this->setError('msg_ftp_not_connected', 'host');
-		}
-
-		$login_result = @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password);
-		if(!$login_result)
-		{
-			ftp_close($connection);
-			return $this->setError('msg_ftp_invalid_auth_info');
-		}
-
-		// create temp file
-		$pin = $_SERVER['REQUEST_TIME'];
-		FileHandler::writeFile('./files/cache/ftp_check', $pin);
-
-		// create path candidate
-		$xe_path = RX_BASEDIR;
-		$path_info = array_reverse(explode('/', RX_BASEDIR));
-		array_pop($path_info); // remove last '/'
-		$path_candidate = array();
-
-		$temp = '';
-		foreach($path_info as $path)
-		{
-			$temp = '/' . $path . $temp;
-			$path_candidate[] = $temp;
-		}
-
-		// try
-		foreach($path_candidate as $path)
-		{
-			// upload check file
-			if(!ftp_put($connection, $path . 'ftp_check.html', FileHandler::getRealPath('./files/cache/ftp_check'), FTP_BINARY))
-			{
-				continue;
-			}
-
-			// get check file
-			$result = FileHandler::getRemoteResource(getNotencodedFullUrl() . 'ftp_check.html');
-
-			// delete temp check file
-			ftp_delete($connection, $path . 'ftp_check.html');
-
-			// found
-			if($result == $pin)
-			{
-				$found_path = $path;
-				break;
-			}
-		}
-
-		FileHandler::removeFile('./files/cache/ftp_check', $pin);
-
-		if($found_path)
-		{
-			$this->add('found_path', $found_path);
-		}
-	}
-
-	/**
-	 * Find XE installed path on ftp
-	 */
-	function getAdminFTPPath()
-	{
-		Context::loadLang(RX_BASEDIR . 'modules/autoinstall/lang');
-		@set_time_limit(5);
-
-		$ftp_info = Context::getRequestVars();
-
-		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password)
-		{
-			return new BaseObject(1, 'msg_ftp_invalid_auth_info');
-		}
-
-		if(!$ftp_info->ftp_host)
-		{
-			$ftp_info->ftp_host = '127.0.0.1';
-		}
-
-		if(!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
-		{
-			$ftp_info->ftp_port = '21';
-		}
-
-		if($ftp_info->sftp == 'Y')
-		{
-			if(!function_exists('ssh2_sftp'))
-			{
-				return $this->setError('disable_sftp_support');
-			}
-			return $this->getSFTPPath();
-		}
-
-		if($ftp_info->ftp_pasv == 'N')
-		{
-			if(function_exists('ftp_connect'))
-			{
-				return $this->getFTPPath();
-			}
-			$ftp_info->ftp_pasv = "Y";
-		}
-
-		$oFTP = new ftp();
-		if(!$oFTP->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
-		{
-			return new BaseObject(1, sprintf(lang('msg_ftp_not_connected'), 'host'));
-		}
-
-		if(!$oFTP->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
-		{
-			return new BaseObject(1, 'msg_ftp_invalid_auth_info');
-		}
-
-		// create temp file
-		$pin = $_SERVER['REQUEST_TIME'];
-		FileHandler::writeFile('./files/cache/ftp_check', $pin);
-
-		// create path candidate
-		$xe_path = RX_BASEDIR;
-		$path_info = array_reverse(explode('/', RX_BASEDIR));
-		array_pop($path_info); // remove last '/'
-		$path_candidate = array();
-
-		$temp = '';
-		foreach($path_info as $path)
-		{
-			$temp = '/' . $path . $temp;
-			$path_candidate[] = $temp;
-		}
-
-		// try
-		foreach($path_candidate as $path)
-		{
-			// upload check file
-			if(!$oFTP->ftp_put($path . 'ftp_check.html', FileHandler::getRealPath('./files/cache/ftp_check')))
-			{
-				continue;
-			}
-
-			// get check file
-			$result = FileHandler::getRemoteResource(getNotencodedFullUrl() . 'ftp_check.html');
-
-			// delete temp check file
-			$oFTP->ftp_delete($path . 'ftp_check.html');
-
-			// found
-			if($result == $pin)
-			{
-				$found_path = $path;
-				break;
-			}
-		}
-
-		FileHandler::removeFile('./files/cache/ftp_check', $pin);
-
-		if($found_path)
-		{
-			$this->add('found_path', $found_path);
-		}
-	}
-
-	/**
-	 * Add file list to Object after sftp connect
-	 * @return void|Object
-	 */
-	function getSFTPList()
-	{
-		$ftp_info = Context::getRequestVars();
-		if(!$ftp_info->ftp_host)
-		{
-			$ftp_info->ftp_host = "127.0.0.1";
-		}
-		$connection = ssh2_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
-		if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
-		{
-			return $this->setError('msg_ftp_invalid_auth_info');
-		}
-
-		$sftp = ssh2_sftp($connection);
-		$curpwd = "ssh2.sftp://$sftp" . $this->pwd;
-		$dh = @opendir($curpwd);
-		if(!$dh)
-		{
-			return $this->setError('msg_ftp_invalid_path');
-		}
-		$list = array();
-		while(($file = readdir($dh)) !== FALSE)
-		{
-			if(is_dir($curpwd . $file))
-			{
-				$file .= "/";
-			}
-			else
-			{
-				continue;
-			}
-			$list[] = $file;
-		}
-		closedir($dh);
-		$this->add('list', $list);
-	}
-
-	/**
-	 * Add file list to Object after ftp connect
-	 * @return void|Object
-	 */
-	function getAdminFTPList()
-	{
-		Context::loadLang(RX_BASEDIR . 'modules/autoinstall/lang');
-		@set_time_limit(5);
-
-		$ftp_info = Context::getRequestVars();
-		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password)
-		{
-			return $this->setError('msg_ftp_invalid_auth_info');
-		}
-
-		$this->pwd = $ftp_info->ftp_root_path;
-
-		if(!$ftp_info->ftp_host)
-		{
-			$ftp_info->ftp_host = "127.0.0.1";
-		}
-
-		if(!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
-		{
-			$ftp_info->ftp_port = "21";
-		}
-
-		if($ftp_info->sftp == 'Y')
-		{
-			if(!function_exists('ssh2_sftp'))
-			{
-				return $this->setError('disable_sftp_support');
-			}
-			return $this->getSFTPList();
-		}
-
-		$oFtp = new ftp();
-		if($oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
-		{
-			if($oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
-			{
-				$_list = $oFtp->ftp_rawlist($this->pwd);
-				$oFtp->ftp_quit();
-			}
-			else
-			{
-				return $this->setError('msg_ftp_invalid_auth_info');
-			}
-		}
-		$list = array();
-
-		if($_list)
-		{
-			foreach($_list as $k => $v)
-			{
-				$src = new stdClass();
-				$src->data = $v;
-				$res = Context::convertEncoding($src);
-				$v = $res->data;
-				if(strpos($v, 'd') === 0 || strpos($v, '<DIR>'))
-				{
-					$list[] = substr(strrchr($v, ' '), 1) . '/';
-				}
-			}
-		}
-		else
-		{
-			return $this->setError('msg_ftp_no_directory');
-		}
-		$this->add('list', $list);
-	}
-
-	/**
-	 * Return theme info list by theme directory list
-	 * @return array
-	 */
-	function getThemeList()
-	{
-		$path = RX_BASEDIR . 'themes';
-		$list = FileHandler::readDir($path);
-
-		$theme_info = array();
-		if(count($list) > 0)
-		{
-			foreach($list as $val)
-			{
-				$theme_info[$val] = $this->getThemeInfo($val);
-			}
-		}
-
-		return $theme_info;
-	}
-
-	/**
-	 * Return theme info
-	 * @param string $theme_name
-	 * @param array $layout_list
-	 * @return object
-	 */
-	function getThemeInfo($theme_name, $layout_list = NULL)
-	{
-		if($GLOBALS['__ThemeInfo__'][$theme_name])
-		{
-			return $GLOBALS['__ThemeInfo__'][$theme_name];
-		}
-
-		$info_file = RX_BASEDIR . 'themes/' . $theme_name . '/conf/info.xml';
-		if(!file_exists($info_file))
-		{
-			return;
-		}
-
-		$oXmlParser = new XeXmlParser();
-		$_xml_obj = $oXmlParser->loadXmlFile($info_file);
-		if(!$_xml_obj->theme)
-		{
-			return;
-		}
-
-		$xml_obj = $_xml_obj->theme;
-
-		// 스킨이름
-		$theme_info = new stdClass();
-		$theme_info->name = $theme_name;
-		$theme_info->title = $xml_obj->title->body;
-		$thumbnail = './themes/' . $theme_name . '/thumbnail.png';
-		$theme_info->thumbnail = (FileHandler::exists($thumbnail)) ? $thumbnail : NULL;
-		$theme_info->version = $xml_obj->version->body;
-		$date_obj = new stdClass();
-		sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
-		$theme_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-		$theme_info->description = $xml_obj->description->body;
-		$theme_info->path = './themes/' . $theme_name . '/';
-
-		if(!is_array($xml_obj->publisher))
-		{
-			$publisher_list = array();
-			$publisher_list[] = $xml_obj->publisher;
-		}
-		else
-		{
-			$publisher_list = $xml_obj->publisher;
-		}
-
-		$theme_info->publisher = array();
-		foreach($publisher_list as $publisher)
-		{
-			$publisher_obj = new stdClass();
-			$publisher_obj->name = $publisher->name->body;
-			$publisher_obj->email_address = $publisher->attrs->email_address;
-			$publisher_obj->homepage = $publisher->attrs->link;
-			$theme_info->publisher[] = $publisher_obj;
-		}
-
-		$layout = $xml_obj->layout;
-		$layout_path = $layout->directory->attrs->path;
-		$layout_parse = explode('/', $layout_path);
-		$layout_info = new stdClass();
-		switch($layout_parse[1])
-		{
-			case 'themes' :
-					$layout_info->name = $theme_name . '|@|' . $layout_parse[count($layout_parse) - 1];
-					break;
-
-			case 'layouts' :
-					$layout_info->name = $layout_parse[count($layout_parse) - 1];
-					break;
-
-		}
-		$layout_info->title = $layout_parse[count($layout_parse) - 1];
-		$layout_info->path = $layout_path;
-
-		$site_info = Context::get('site_module_info');
-		// check layout instance
-		$is_new_layout = TRUE;
-		$oLayoutModel = getModel('layout');
-		$layout_info_list = array();
-		$layout_list = $oLayoutModel->getLayoutList();
-		if($layout_list)
-		{
-			foreach($layout_list as $val)
-			{
-				if($val->layout == $layout_info->name)
-				{
-					$is_new_layout = FALSE;
-					$layout_info->layout_srl = $val->layout_srl;
-					break;
-				}
-			}
-		}
-
-		if($is_new_layout)
-		{
-			$site_module_info = Context::get('site_module_info');
-			$args = new stdClass();
-			$args->layout_srl = getNextSequence();
-			$args->layout = $layout_info->name;
-			$args->title = $layout_info->title;
-			$args->layout_type = "P";
-			// Insert into the DB
-			$oLayoutAdminController = getAdminController('layout');
-			$output = $oLayoutAdminController->insertLayout($args);
-			$layout_info->layout_srl = $args->layout_srl;
-		}
-
-		$theme_info->layout_info = $layout_info;
-
-		$skin_infos = $xml_obj->skininfos;
-		if(is_array($skin_infos->skininfo))
-		{
-			$skin_list = $skin_infos->skininfo;
-		}
-		else
-		{
-			$skin_list = array($skin_infos->skininfo);
-		}
-
-		$oModuleModel = getModel('module');
-		$skins = array();
-		foreach($skin_list as $val)
-		{
-			$skin_info = new stdClass();
-			unset($skin_parse);
-			$skin_parse = explode('/', $val->directory->attrs->path);
-			switch($skin_parse[1])
-			{
-				case 'themes' :
-						$is_theme = TRUE;
-						$module_name = $skin_parse[count($skin_parse) - 1];
-						$skin_info->name = $theme_name . '|@|' . $module_name;
-						break;
-
-				case 'modules' :
-						$is_theme = FALSE;
-						$module_name = $skin_parse[2];
-						$skin_info->name = $skin_parse[count($skin_parse) - 1];
-						break;
-
-			}
-			$skin_info->path = $val->directory->attrs->path;
-			$skin_info->is_theme = $is_theme;
-			$skins[$module_name] = $skin_info;
-
-			if($is_theme)
-			{
-				if(!$GLOBALS['__ThemeModuleSkin__'][$module_name])
-				{
-					$GLOBALS['__ThemeModuleSkin__'][$module_name] = array();
-					$GLOBALS['__ThemeModuleSkin__'][$module_name]['skins'] = array();
-					$moduleInfo = $oModuleModel->getModuleInfoXml($module_name);
-					$GLOBALS['__ThemeModuleSkin__'][$module_name]['title'] = $moduleInfo->title;
-				}
-				$GLOBALS['__ThemeModuleSkin__'][$module_name]['skins'][$skin_info->name] = $oModuleModel->loadSkinInfo($skin_info->path, '', '');
-			}
-		}
-		$theme_info->skin_infos = $skins;
-
-		$GLOBALS['__ThemeInfo__'][$theme_name] = $theme_info;
-		return $theme_info;
-	}
-
 	/**
 	 * Return theme module skin list
 	 * @return array
 	 */
-	function getModulesSkinList()
+	public function getModulesSkinList()
 	{
 		if($GLOBALS['__ThemeModuleSkin__']['__IS_PARSE__'])
 		{
@@ -617,111 +50,11 @@ class adminAdminModel extends admin
 		return $GLOBALS['__ThemeModuleSkin__'];
 	}
 
-	/**
-	 * Return admin menu language
-	 * @return array
-	 */
-	function getAdminMenuLang()
-	{
-		static $lang = null;
-		
-		if ($lang === null)
-		{
-			$lang = Rhymix\Framework\Cache::get('admin_menu_langs:' . Context::getLangType());
-		}
-		if ($lang === null)
-		{
-			$lang = array();
-			$oModuleModel = getModel('module');
-			$installed_module_list = $oModuleModel->getModulesXmlInfo();
-			foreach($installed_module_list as $key => $value)
-			{
-				$moduleActionInfo = $oModuleModel->getModuleActionXml($value->module);
-				if(isset($moduleActionInfo->menu) && is_object($moduleActionInfo->menu))
-				{
-					foreach($moduleActionInfo->menu as $key2 => $value2)
-					{
-						$lang[$key2] = $value2->title;
-					}
-				}
-			}
-			
-			Rhymix\Framework\Cache::set('admin_menu_langs:' . Context::getLangType(), $lang, 0, true);
-		}
-
-		return $lang;
-	}
-
-	/**
-	 * Get admin favorite list
-	 * @param int $site_srl @deprecated
-	 * @param bool $isGetModuleInfo
-	 * @return object
-	 */
-	function getFavoriteList($site_srl = 0, $isGetModuleInfo = FALSE)
-	{
-		$args = new stdClass();
-		$output = executeQueryArray('admin.getFavoriteList', $args);
-		if(!$output->toBool())
-		{
-			return $output;
-		}
-		if(!$output->data)
-		{
-			return new BaseObject();
-		}
-
-		if($isGetModuleInfo && is_array($output->data))
-		{
-			$oModuleModel = getModel('module');
-			foreach($output->data AS $key => $value)
-			{
-				$moduleInfo = $oModuleModel->getModuleInfoXml($value->module);
-				$output->data[$key]->admin_index_act = $moduleInfo->admin_index_act;
-				$output->data[$key]->title = $moduleInfo->title;
-			}
-		}
-
-		$returnObject = new BaseObject();
-		$returnObject->add('favoriteList', $output->data);
-		return $returnObject;
-	}
-
-	/**
-	 * Check available insert favorite
-	 * @param int $site_srl @deprecated
-	 * @param string $module
-	 * @return object
-	 */
-	function isExistsFavorite($site_srl, $module)
-	{
-		$args = new stdClass();
-		$args->module = $module;
-		$output = executeQuery('admin.getFavorite', $args);
-		if(!$output->toBool())
-		{
-			return $output;
-		}
-
-		$returnObject = new BaseObject();
-		if($output->data)
-		{
-			$returnObject->add('result', TRUE);
-			$returnObject->add('favoriteSrl', $output->data->admin_favorite_srl);
-		}
-		else
-		{
-			$returnObject->add('result', FALSE);
-		}
-
-		return $returnObject;
-	}
-
 	/**
 	 * Return site list
 	 * @return void
 	 */
-	function getSiteAllList()
+	public function getSiteAllList()
 	{
 		if(Context::get('domain'))
 		{
@@ -737,7 +70,7 @@ class adminAdminModel extends admin
 	 *
 	 * @return array
 	 */
-	function getAllSitesThatHaveModules($domain = NULL)
+	public function getAllSitesThatHaveModules($domain = NULL)
 	{
 		$args = new stdClass();
 		if($domain)
@@ -785,17 +118,16 @@ class adminAdminModel extends admin
 	 * @param string $date
 	 * @return int
 	 */
-	function getSiteCountByDate($date = '')
+	public function getSiteCountByDate($date = '')
 	{
-		$args = new stdClass();
-
-		if($date)
+		$args = new stdClass;
+		if ($date)
 		{
 			$args->regDate = date('Ymd', strtotime($date));
 		}
 
 		$output = executeQuery('admin.getSiteCountByDate', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return 0;
 		}
@@ -803,64 +135,81 @@ class adminAdminModel extends admin
 		return $output->data->count;
 	}
 
-	function getFaviconUrl($domain_srl = 0)
+	/**
+	 * Deprecated aliases to model methods
+	 */
+	public function getAdminMenuName()
 	{
-		return $this->iconUrlCheck('favicon.ico', 'faviconSample.png', $domain_srl);
+		return Rhymix\Modules\Admin\Models\AdminMenu::getAdminMenuName();
 	}
 
-	function getMobileIconUrl($domain_srl = 0)
+	public function getAdminMenuLang()
 	{
-		return $this->iconUrlCheck('mobicon.png', 'mobiconSample.png', $domain_srl);
+		return Rhymix\Modules\Admin\Models\AdminMenu::getAdminMenuLang();
 	}
-	
-	function getSiteDefaultImageUrl($domain_srl = 0, &$width = 0, &$height = 0)
+
+	public function getFavoriteList($site_srl = 0, $add_module_info = false)
+	{
+		return Rhymix\Modules\Admin\Models\Favorite::getFavorites($add_module_info);
+	}
+
+	public function isExistsFavorite($site_srl, $module)
+	{
+		return Rhymix\Modules\Admin\Models\Favorite::isFavorite($module);
+	}
+
+	public function getFaviconUrl($domain_srl = 0)
+	{
+		return Rhymix\Modules\Admin\Models\Icon::getFaviconUrl($domain_srl);
+	}
+
+	public function getMobileIconUrl($domain_srl = 0)
+	{
+		return Rhymix\Modules\Admin\Models\Icon::getMobiconUrl($domain_srl);
+	}
+
+	public function getSiteDefaultImageUrl($domain_srl = 0, &$width = 0, &$height = 0)
+	{
+		return Rhymix\Modules\Admin\Models\Icon::getDefaultImageUrl($domain_srl, $width, $height);
+	}
+
+	public function iconUrlCheck($iconname, $default_icon_name, $domain_srl)
+	{
+		return Rhymix\Modules\Admin\Models\Icon::getIconUrl($domain_srl, $iconname);
+	}
+
+	public function getSFTPPath()
+	{
+		return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
+	}
+
+	public function getFTPPath()
+	{
+		return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
+	}
+
+	public function getAdminFTPPath()
+	{
+		return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
+	}
+
+	public function getSFTPList()
+	{
+		return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
+	}
+
+	public function getAdminFTPList()
+	{
+		return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
+	}
+
+	public function getThemeList()
+	{
+		return [];
+	}
+
+	public function getThemeInfo($theme_name, $layout_list = [])
 	{
-		$domain_srl = intval($domain_srl);
-		if ($domain_srl)
-		{
-			$virtual_site = $domain_srl . '/';
-		}
-		else
-		{
-			$virtual_site = '';
-		}
 		
-		$info = Rhymix\Framework\Storage::readPHPData(\RX_BASEDIR . 'files/attach/xeicon/' . $virtual_site . 'default_image.php');
-		if ($info && Rhymix\Framework\Storage::exists(\RX_BASEDIR . $info['filename']))
-		{
-			$width = $info['width'];
-			$height = $info['height'];
-			return \RX_BASEURL . $info['filename'] . '?' . date('YmdHis', filemtime(\RX_BASEDIR . $info['filename']));
-		}
-		else
-		{
-			return false;
-		}
 	}
-
-	function iconUrlCheck($iconname, $default_icon_name, $domain_srl)
-	{
-		$domain_srl = intval($domain_srl);
-		if ($domain_srl)
-		{
-			$virtual_site = $domain_srl . '/';
-		}
-		else
-		{
-			$virtual_site = '';
-		}
-		
-		$filename = 'files/attach/xeicon/' . $virtual_site . $iconname;
-		if (Rhymix\Framework\Storage::exists(\RX_BASEDIR . $filename))
-		{
-			return \RX_BASEURL . $filename . '?' . date('YmdHis', filemtime(\RX_BASEDIR . $filename));
-		}
-		else
-		{
-			return false;
-		}
-	}
-
 }
-/* End of file admin.admin.model.php */
-/* Location: ./modules/admin/admin.admin.model.php */