Merge 47b10a61bc into 43fb073c5e

config.simple.php

@@ -23,11 +23,13 @@ $site_setting = [];
 //站点标题
 $site_setting['title']          =   'OneNav';
 //文字Logo
-$site_setting['logo']          =   'OneNav';
+$site_setting['logo']           =   'OneNav';
 //站点关键词
 $site_setting['keywords']       =   'OneNav,OneNav导航,OneNav书签,开源导航,开源书签,简洁导航,云链接,个人导航,个人书签';
 //站点描述
 $site_setting['description']    =   'OneNav是一款使用PHP + SQLite3开发的简约导航/书签管理器，免费开源。';
+//直链
+$site_setting['straight']       =   '';
 
 //这两项不要修改
 $site_setting['user']           =   USER;

controller/api.php

@@ -295,6 +295,8 @@ function set_site($api) {
     $data['subtitle'] = htmlspecialchars($_POST['subtitle']);
     //获取关键词
     $data['keywords'] = htmlspecialchars($_POST['keywords']);
+    //获取是否直链
+    $data['straight'] = htmlspecialchars($_POST['straight']);
     //获取描述
     $data['description'] = htmlspecialchars($_POST['description']);
     //获取自定义header

controller/index.php

@@ -22,7 +22,7 @@ if( is_login() ){
             "fid"   =>  $value['id'],
             "ORDER"     =>  ["weight" => "DESC"]
         ]);
-        
+
         foreach ($category_subs as $category_sub) {
             array_push($categorys,$category_sub);
         }
@@ -44,11 +44,11 @@ if( is_login() ){
     function get_links($fid) {
         global $db;
         $fid = intval($fid);
-        $links = $db->select('on_links','*',[ 
+        $links = $db->select('on_links','*',[
                 'fid'   =>  $fid,
                 'ORDER' =>  ["weight" => "DESC"]
             ]);
-        return $links;
+        return handle_link($links);
     }
     //右键菜单标识
     $onenav['right_menu'] = 'admin_menu();';
@@ -73,7 +73,7 @@ else{
             'property'  =>  0,
             "ORDER"     =>  ["weight" => "DESC"]
         ]);
-        
+
         foreach ($category_subs as $category_sub) {
             array_push($categorys,$category_sub);
         }
@@ -95,17 +95,44 @@ else{
     function get_links($fid) {
         global $db;
         $fid = intval($fid);
-        $links = $db->select('on_links','*',[ 
+        $links = $db->select('on_links','*',[
             'fid' =>  $fid,
             'property'  =>  0,
             'ORDER' =>  ["weight" => "DESC"]
         ]);
-        return $links;
+        return handle_link($links);
     }
     //右键菜单标识
     $onenav['right_menu'] = 'user_menu();';
 }
-
+//处理得到的转换链接数据
+function handle_link($data)
+{
+    if (empty($data)) {
+        return $data;
+    }
+    global $db;
+    $site = $db->get('on_options', 'value', ['key' => "s_site"]);
+    $site = unserialize($site);
+    $type = 1; //模式1 原链接
+    if (! empty($site['straight']) && $site['straight'] == "open") {
+        //有且只有开关的时候  才处理
+        $type = 2; //模式2  新链接
+    }
+    $hrefLink = "";
+    foreach ($data as &$value) {
+        switch ($type) {
+            case "1":
+                $hrefLink = "/index.php?c=click&id=" . $value['id'];
+                break;
+            case "2":
+                $hrefLink = $value['url'];
+                break;
+        }
+        $value['href_link'] = $hrefLink;
+    }
+    return $data;
+}
 //获取版本号
 function get_version(){
     if( file_exists('version.txt') ) {
@@ -116,7 +143,7 @@ function get_version(){
         $version = 'null';
         return $version;
     }
-} 
+}
 
 //将URL转换为base64编码
 function base64($url){

templates/admin/setting/site.php

@@ -50,7 +50,12 @@
             <textarea placeholder="网站描述，一般不超过200字符" name = "description" class="layui-textarea"><?php echo $site['description']; ?></textarea>
             </div>
         </div>
-
+        <div class="layui-form-item" pane="">
+            <label class="layui-form-label">是否直链</label>
+            <div class="layui-input-block">
+                <input type="checkbox" <?php if($site['straight']=="open"){echo 'checked=""';}  ?> name="straight" value="open" lay-skin="switch" lay-filter="switchTest" title="开关">
+            </div>
+        </div>
         <div class="layui-form-item layui-form-text">
             <label class="layui-form-label">自定义header</label>
             <div class="layui-input-block">

templates/default/index.php

@@ -207,7 +207,7 @@
 					$id = $link['id'];
 				//var_dump($link);
 			?>
-			<a href="/index.php?c=click&id=<?php echo $link['id']; ?>" target="_blank" title = "<?php echo $link['description']; ?>">
+            <a href="<?php echo $link['href_link']; ?>" target="_blank" title = "<?php echo $link['description']; ?>">
 			<div class="mdui-col-lg-2 mdui-col-md-3 mdui-col-sm-4 mdui-col-xs-6 link-space" id = "id_<?php echo $link['id']; ?>" link-title = "<?php echo $link['title']; ?>" link-url = "<?php echo $link['url']; ?>">
 				<!-- 用来搜索匹配使用 -->
 				<span style = "display:none;"><?php echo $link['url']; ?></span>