Merge pull request #9 from andydixon/dev

Dev

cms/functions/createsession.php

@@ -26,8 +26,8 @@ if (!isset($_SESSION['neoCMSSess'])) {
 
 } else $sessname = $_SESSION['neoCMSSess'];
 
-session_name($sessname);
+@session_name($sessname);
-session_cache_expire(240); // 4 hours
+@session_cache_expire(240); // 4 hours
 @session_start();
 
 $ver = 'NeoCMS 0.1';

cms/js/dash.js

@@ -90,7 +90,7 @@ changePrefs = function () {
 };
 logout = function () {
     $.ajax({
-        type: "POST", url: "../functions/logout.php", success: function () {
+        type: "POST", url: "../core/logout.php", success: function () {
             window.location = '../../'
         }
     })

cms/js/main.js

@@ -150,25 +150,28 @@ linkBind = function () {
 checkURL = function (linky) {
     var linkHref = (linky.match('://')) ? linky.split('://') : linky;
     $('#neoCMSFilesWrap').remove();
-    if (linkHref[0] == 'http' && linkHref[1]) {
+    if ((linkHref[0] == 'http' || linkHref[0] == 'https') && linkHref[1]) {
         if (linkHref[1].match('/')) linkHref = linkHref[1].split('/');
+        linkHref = linkHref[0].split(':');
         linkHref = linkHref[0];
         var neoCMSLoc = window.location.href.split('//');
         neoCMSLoc = neoCMSLoc[1].split('/');
         neoCMSLoc = neoCMSLoc[0];
         if (linkHref == neoCMSLoc || linkHref == 'www.' + neoCMSLoc) {
             if ($('#neoCMSPageEdits .edit', ifrDoc).length) {
+                console.log(linkHref);
                 navAwayPrompt(linky, 'loc')
             } else {
+                console.log($('#neoCMSPageSrc').length);
                 if ($('#neoCMSPageSrc').length) {
                     $.ajax({
-                        type: "POST", url: "functions/getpage.php", data: "page=" + linky, success: function () {
+                        type: "POST", url: "core/getpage.php", data: "page=" + linky, success: function () {
                             if (frames['neoCMSPageSrc'].contentWindow) frames['neoCMSPageSrc'].contentWindow.location.href = linky; else frames['neoCMSPageSrc'].location.href = linky
                         }
                     })
                 } else {
                     $.ajax({
-                        type: "POST", url: "../functions/getpage.php", data: "page=" + linky, success: function () {
+                        type: "POST", url: "../core/getpage.php", data: "page=" + linky, success: function () {
                             window.location = '../'
                         }
                     })

cms/js/ui.js

@@ -1861,7 +1861,7 @@ logoutPrompt = function () {
 };
 logout = function () {
     $.ajax({
-        type: "POST", url: "functions/logout.php", success: function () {
+        type: "POST", url: "core/logout.php", success: function () {
             window.location = retUrl()
         }
     })

cms/templates/image-editor.html

@@ -3,7 +3,7 @@
     <div class="neoCMSImgChoose neoCMSImgChooseInline clearfix" id="neoCMSImgChoose">
         <h4>Upload A New Image</h4>
         <p>First select the folder you want to upload to:</p>
-        <form action="functions/upload.php?type=img" class="neoCMSImgLoc" enctype="multipart/form-data" id="neoCMSImgLoc"
+        <form action="core/upload.php?type=img" class="neoCMSImgLoc" enctype="multipart/form-data" id="neoCMSImgLoc"
               method="POST" target="neoCMSImgUploadIframe">
             <select id="neoCMSImgFolder" name="neoCMSImgFolder">
                 <option class="defaultFolder" id="neoCMSImgFolderDefault" selected="selected" value="">Loading&hellip;

cms/templates/upload.html

@@ -1,7 +1,7 @@
 <div class="neoCMSUploadContent neoCMSPrompt clearfix" id="neoCMSPrompt">
     <h4 class="neoCMSPromptTitle" id="neoCMSPromptTitle">Upload A File</h4>
     <p id="neoCMSUploadTxt">To upload a file, first select the folder you want to upload to:</p>
-    <form action="functions/upload.php" class="neoCMSUploadForm neoCMSImgChooseInline" enctype="multipart/form-data" id="neoCMSUploadForm"
+    <form action="core/upload.php" class="neoCMSUploadForm neoCMSImgChooseInline" enctype="multipart/form-data" id="neoCMSUploadForm"
           method="POST" name="neoCMSUploadForm" target="neoCMSUploadIframe">
         <ul>
             <li>

page2.html

@@ -0,0 +1,138 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Default page</title>
+    <meta charset="utf-8">
+    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta content="Default page" name="description">
+    <meta content="width=device-width, initial-scale=1" name="viewport">
+    <link href="https://fonts.googleapis.com" rel="preconnect">
+    <link href="https://fonts.googleapis.com/css2?family=DM+Sans&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css2?family=DM+Sans:wght@400;700&display=swap" rel="stylesheet">
+    <style>
+        body {
+            margin: 0px;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            width: 100vw;
+            height: 100vh;
+            min-height: 675px;
+            background-color: #F4F5FF;
+        }
+
+        p {
+            width: 100%;
+            left: 0px;
+            font-size: 16px;
+            font-family: 'DM Sans', sans-serif;
+            font-weight: 400;
+            letter-spacing: 0px;
+            text-align: center;
+            vertical-align: top;
+            max-width: 550px;
+            color: #727586;
+            margin: 0px;
+        }
+
+        a:hover {
+            cursor: pointer;
+            color: #673DE6;
+            text-decoration: underline;
+        }
+
+        h1 {
+            font-family: 'DM Sans', sans-serif;
+            font-size: 24px;
+            font-weight: 700;
+            letter-spacing: 0px;
+            text-align: center;
+            margin: 8px;
+        }
+
+        .content {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            width: 100%;
+            height: 100%;
+        }
+
+        .ic-launch {
+            margin-left: 10.5px;
+            width: 21px !important;
+            height: 20px !important;
+        }
+
+        .link-container {
+            margin-top: 32px;
+            margin-bottom: 32px;
+        }
+
+        .link {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            font-family: 'DM Sans', sans-serif;
+            font-style: normal;
+            font-weight: 700;
+            font-size: 14px;
+            color: #673DE6;
+            margin-top: 8px;
+            text-decoration: none;
+        }
+
+        .main-image {
+            width: 100%;
+            max-width: 650px;
+            max-height: 406px;
+            height: auto;
+        }
+
+        .navigation {
+            width: 100%;
+            height: 72px;
+            display: flex;
+            margin: 0;
+            padding: 0;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            background-color: #36344D;
+        }
+
+        @media screen and (max-width: 580px) and (min-width: 0px) {
+            h1, p, .link-container {
+                width: 80%;
+            }
+        }
+
+        @media screen and (min-width: 650px) and (min-height: 0px) and (max-height: 750px) {
+            .link-container {
+                margin-top: 12px;
+            }
+
+            h1 {
+                margin-top: 0px;
+                margin-bottom: 0px;
+            }
+        }
+
+        .navigation {
+            color: white;
+        }
+    </style>
+</head>
+<body>
+<nav class="navigation neocms">
+    <h1>neoCMS</h1>
+</nav>
+<div class="content neocms">
+    <h1>This is page 2</h1>
+
+</div>
+</body>
+</html>