apply favicon, mobile icon

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9097 201d5d3c-b55e-5fd7-737f-ddc643e51545

classes/display/HTMLDisplayHandler.php

@@ -121,6 +121,14 @@ class HTMLDisplayHandler {
 		// Remove unnecessary information
 		$output = preg_replace('/member\_\-([0-9]+)/s','member_0',$output);
 
+		// set icon
+		$oAdminModel = &getAdminModel('admin');
+		$favicon_url = $oAdminModel->getFaviconUrl();
+		$mobicon_url = $oAdminModel->getMobileIconUrl();
+		Context::set('favicon_url', $favicon_url);
+		Context::set('mobicon_url', $mobicon_url);
+		debugPrint($favicon_url);
+
 		// convert the final layout
 		Context::set('content', $output);
 		$oTemplate = &TemplateHandler::getInstance();

common/tpl/common_layout.html

@@ -58,6 +58,9 @@
     <link rel="alternate" type="application/atom+xml" title="Site Atom" href="{$general_atom_url}" />
 <!--@end-->
 
+<link cond="$favicon_url" rel="shortcut icon" href="{$favicon_url}" />
+<link cond="$mobicon_url" rel="apple-touch-icon" href="{$mobicon_url}" />
+
 {@ $ssl_actions = Context::getSSLActions() }
     <script type="text/javascript">//<![CDATA[
         var current_url = "{$current_url}";

common/tpl/mobile_layout.html

@@ -36,6 +36,10 @@
     <link rel="alternate" type="application/rss+xml" title="Site RSS" href="{$general_rss_url}" />
     <link rel="alternate" type="application/atom+xml" title="Site Atom" href="{$general_atom_url}" />
 <!--@end-->
+
+<link cond="$favicon_url" rel="shortcut icon" href="{$favicon_url}" />
+<link cond="$mobicon_url" rel="apple-touch-icon" href="{$mobicon_url}" />
+
 <script type="text/javascript" src="../js/html5.js" cond="$db_info->use_html5=='Y'"></script>
 <!--[if lt IE 9]><script type="text/javascript" src="../js/respond.min.js"></script><![endif]-->
 {@ $ssl_actions = Context::getSSLActions() }

modules/admin/admin.admin.model.php

@@ -416,4 +416,25 @@
 
 			return $output->data->count;
 		}
+
+		function getFaviconUrl()
+		{
+			return $this->iconUrlCheck('favicon.ico','faviconSample.png');
+		}
+
+		function getMobileIconUrl()
+		{
+			return $this->iconUrlCheck('mobicon.png','mobiconSample.png');
+		}
+
+		function iconUrlCheck($iconname,$default_icon_name)
+		{
+			$file_exsit = FileHandler::readFile(_XE_PATH_.'files/attach/xeicon/'.$iconname);
+			if(!$file_exsit){
+				$icon_url = './modules/admin/tpl/img/'.$default_icon_name	;
+			} else {
+				$icon_url = $db_info->default_url.'files/attach/xeicon/'.$iconname;
+			}
+			return $icon_url;
+		}
 	}

modules/admin/admin.admin.view.php

@@ -368,9 +368,9 @@
 
             Context::set('admin_ip', $db_info->admin_ip);
 
-
+			$oAdminModel = &getAdminModel('admin');
-			$favicon_url = $this->iconUrlCheck('favicon.ico','faviconSample.png');
+			$favicon_url = $oAdminModel->getFaviconUrl();
-			$mobicon_url = $this->iconUrlCheck('mobicon.png','mobiconSample.png');
+			$mobicon_url = $oAdminModel->getMobileIconUrl();
             Context::set('favicon_url', $favicon_url);
 			Context::set('mobicon_url', $mobicon_url);
 
@@ -487,14 +487,4 @@
 
 			$this->setTemplateFile('theme');
 		}
-
-		function iconUrlCheck($iconname,$default_icon_name){
-			$file_exsit = FileHandler::readFile(_XE_PATH_.'files/attach/xeicon/'.$iconname);
-			if(!$file_exsit){
-				$icon_url = './modules/admin/tpl/img/'.$default_icon_name	;
-			} else {
-				$icon_url = $db_info->default_url.'files/attach/xeicon/'.$iconname;
-			}
-			return $icon_url;
-		}
     }

modules/admin/tpl/js/config.js

@@ -81,14 +81,24 @@ function completeGetFtpInfo(ret_obj)
     e.append(jQuery(list));
 }
 
+var icon = null;
 function deleteIcon(iconname){
 	var params = new Array();
 	params['iconname'] = iconname;
 	exec_xml('admin', 'procAdminRemoveIcons', params, iconDeleteMessage, ['error', 'message'], params);
-	
+	icon = iconname;
 }
 function iconDeleteMessage(ret_obj){
- alert(ret_obj['message']);
+	alert(ret_obj['message']);
+
+	if (ret_obj['error'] == '0')
+	{
+		if (icon == 'favicon.ico'){
+			jQuery('.faviconPreview img').attr('src', 'modules/admin/tpl/img/faviconSample.png');
+		}else if (icon == 'mobicon.png'){
+			jQuery('.mobiconPreview img').attr('src', 'modules/admin/tpl/img/mobiconSample.png');
+		}
+	}
 }
 function doRecompileCacheFile() {
 	var params = new Array();

modules/install/install.admin.controller.php

@@ -226,7 +226,7 @@
 				return false;
 			}
 			//FileHandler::createImageFile($target_file, $target_filename, $fitHeight, $fitWidth, $ext);
-			@copy($target_file, $target_filename);
+			FileHandler::copyFile($target_file, $target_filename);
 		}
 
     }