浏览代码

项目访问地址支持个性域名

star7th 9 年之前
父节点
当前提交
64dc9478ac

+ 1 - 2
Application/Common/Conf/config.php

@@ -19,10 +19,9 @@ return array(
     'URL_ROUTER_ON'   => true, 
     'URL_ROUTE_RULES'=>array(
         ':id\d'               => 'Home/Item/Show?item_id=:1',
-        ':domain\s$'               => 'Home/Item/Show?item_domain=:1',//item的个性域名
+		':domain\s$'               => 'Home/Item/Show?item_domain=:1',//item的个性域名
         'uid/:id\d'               => 'Home/Item/showByUid?uid=:1',
     ),
     'URL_CASE_INSENSITIVE'=>true,
     'SHOW_ERROR_MSG'        =>  true,    // 显示错误信息,这样在部署模式下也能显示错误
-
 );

+ 2 - 2
Application/Home/Conf/config.php

@@ -1,8 +1,8 @@
-<?php
+<?php 
 return array(
 	//'配置项'=>'配置值'
     'LANG_SWITCH_ON' => true,   // 开启语言包功能
-    'LANG_AUTO_DETECT' => true, // 自动侦测语言 开启多语言功能后有效
+    'LANG_AUTO_DETECT' => false, // 自动侦测语言 开启多语言功能后有效
     'DEFAULT_LANG' => 'zh-cn', // 默认语言
     'LANG_LIST'        => 'zh-cn,en-us', // 允许切换的语言列表 用逗号分隔
     'VAR_LANGUAGE'     => 'l', // 默认语言切换变量

+ 14 - 0
Application/Home/Controller/IndexController.class.php

@@ -6,6 +6,20 @@ class IndexController extends BaseController {
     	$this->checkLogin(false);
     	$login_user = session("login_user");
     	$this->assign("login_user" ,$login_user);
+    	if (LANG_SET == 'en-us') {
+    		$demo_url = "http://www.showdoc.cc/demo-en";
+    		$help_url = "http://www.showdoc.cc/help-en";
+    		$creator_url = "https://github.com/star7th";
+    	}
+    	else{
+    		$demo_url = "http://www.showdoc.cc/demo";
+    		$help_url = "http://www.showdoc.cc/help";
+    		$creator_url = "http://blog.star7th.com/";
+    	}
+    	$this->assign("demo_url" ,$demo_url);
+    	$this->assign("help_url" ,$help_url);
+    	$this->assign("creator_url" ,$creator_url);
+
         $this->display();
     }
 }

+ 22 - 3
Application/Home/Controller/ItemController.class.php

@@ -24,9 +24,18 @@ class ItemController extends BaseController {
             $this->assign("items" , $items);
             $this->assign("show_user" , $show_user);
             $this->assign("login_user" , $login_user);
-            $this->display();
+            
+        }
+        if (LANG_SET == 'en-us') {
+            $help_url = "http://www.showdoc.cc/help-en";
+        }
+        else{
+            $help_url = "http://www.showdoc.cc/help";
         }
 
+        $this->assign("help_url" , $help_url);
+        $this->display();
+
     }
 
     //新建项目
@@ -43,7 +52,7 @@ class ItemController extends BaseController {
 			$item_domain = I("item_domain");
 
             if ($item_domain) {
-                $item = D("Item")->where("item_domain = '$item_domain' ")->find();
+                $item = D("Item")->where("item_domain = '$item_domain' and item_id !='$item_id' ")->find();
                 if ($item) {
                     //个性域名已经存在
                     $this->message(L('domain_already_exists'));
@@ -141,12 +150,22 @@ class ItemController extends BaseController {
                 }
             }
         }
-        $share_url = get_domain().__APP__.'/'.$item_id;
+
+        $domain = $item['item_domain'] ? $item['item_domain'] : $item['item_id'];
+        $share_url = get_domain().__APP__.'/'.$domain;
 
         $ItemPermn = $this->checkItemPermn($uid , $item_id) ;
 
         $ItemCreator = $this->checkItemCreator($uid , $item_id);
 
+        if (LANG_SET == 'en-us') {
+            $help_url = "http://www.showdoc.cc/help-en";
+        }
+        else{
+            $help_url = "http://www.showdoc.cc/help";
+        }
+
+        $this->assign("help_url" , $help_url);
         $this->assign("current_page_id" , $current_page_id);
         $this->assign("keyword" , $keyword);
         $this->assign("ItemPermn" , $ItemPermn);

+ 3 - 3
Application/Home/View/Index/index.html

@@ -43,15 +43,15 @@
 		      data-slide="next">&rsaquo;</a>
 		</div>
 		<p class="text-center">
-			<a class="btn btn-primary  btn-large" href="http://doc.star7th.com/2" target="_blank">Demo</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<a class="btn  btn-large" href="http://doc.star7th.com/3" target="_blank" >{$Think.Lang.help}&nbsp;<i class="icon-circle-arrow-right"></i></a>
+			<a class="btn btn-primary  btn-large" href="{$demo_url}" target="_blank">Demo</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			<a class="btn  btn-large" href="{$help_url}" target="_blank" >{$Think.Lang.help}&nbsp;<i class="icon-circle-arrow-right"></i></a>
 		</p>
 
       <hr>
 
 
       <div class="footer">
-        <p>&copy; Created By <a href="http://blog.star7th.com/" target="_blank"> Star7th</a></p>
+        <p>&copy; Created By <a href="{$creator_url}" target="_blank">Star7th</a></p>
       </div>
 
     </div> <!-- /container -->

+ 1 - 1
Application/Home/View/Item/show.html

@@ -33,7 +33,7 @@
 
       <if condition="! $login_user">
         <li ><a href="{:U('Home/User/login')}">{$Think.Lang.login_or_register}</a></li>
-        <li ><a href="http://doc.star7th.com/3" target="_blank">{$Think.Lang.about_showdoc}</a></li>
+        <li ><a href="{$help_url}" target="_blank">{$Think.Lang.about_showdoc}</a></li>
         <else />
         <li><a href="{:U('Home/Item/index')}">{$Think.Lang.my_item}</a></li>
       </if>

+ 1 - 1
Application/Home/View/Item/showbyuid.html

@@ -34,7 +34,7 @@
           </if>
           
           
-          <li><a href="http://doc.star7th.com/3" target="_blank">{$Think.Lang.about_showdoc}</a></li>
+          <li><a href="{$help_url}" target="_blank">{$Think.Lang.about_showdoc}</a></li>
 
         </ul>
         </div>