Skip to content

Commit ec45013

Browse files
committed
Merge pull request #59 from ARMmaster17/beta
Beta
2 parents 9101c24 + 3281cf2 commit ec45013

File tree

13 files changed

+98
-91
lines changed

13 files changed

+98
-91
lines changed

bio.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<html>
22
<body>
33
<?php
4+
require_once 'header.php';
45
$author = simplexml_load_file('persons/' . $_GET['u'] . '.xml');
56
echo $author->data[0]->name;
6-
echo '<hr>'
7+
echo '<hr>';
78
echo $author->data[0]->bio;
89
?>
910
</body>

dashboard.php

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,5 @@
11
<?php
2-
//require 'cklogin.php';
3-
require 'styles.php';
4-
require 'settings.php';
5-
//require 'sqldata.php';
6-
7-
//Blocked out for dev purposes. Uncomment when login branch is merged
8-
//if(isloggedin() != 0)
9-
//{
10-
// echo "<html><body>FORBIDDEN</body></html>";
11-
//}
12-
//else if(accessLevel() < $sc_adminPanel)
13-
//{
14-
// echo "<html><body>FORBIDDEN</body></html>";
15-
//}
16-
//else
17-
//{
18-
//start loading page
19-
echo "<html><head>";
20-
echo '<LINK href=\"' . $st_home . '\" rel="stylesheet" type="text/css">';
21-
//This is the place to add google analytics code
22-
//echo
23-
echo "</header><body>";
24-
if(!$st_bodyimage)
25-
{
26-
echo '<body>';
27-
}
28-
else
29-
{
30-
echo '<body style=\"background-image:url(' . $st_bodyimage . ')\">';
31-
}
32-
echo "<h1>" . $cf_title . "</h1>";
33-
echo "<h2>" . $cf_caption . "</h2>";
34-
echo '<hr />';
35-
echo '<br /><br />';
2+
require_once 'header.php';
363
//start admin content
374
echo "<table border=\"1\" style=\"width:100%\">";
385
$dir = "admin/modules/";

header.php

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
//required files
3+
//require_once 'sqldata.php';
4+
require_once 'settings.php';
5+
require_once 'styles.php';
6+
7+
8+
//start HTML headers
9+
echo '<html>';
10+
echo '<header>';
11+
echo '<LINK href=\"' . $st_home . '\" rel="stylesheet" type="text/css">';
12+
//add any header information you need such as Google Analytics tracking
13+
echo '</header>';
14+
15+
//start body
16+
if(!$st_bodyimage)
17+
{
18+
echo '<body>';
19+
}
20+
else
21+
{
22+
echo '<body style=\"background-image:url(' . $st_bodyimage . ')\">';
23+
}
24+
if(!$st_headerimage)
25+
{
26+
echo "<h1>" . $cf_title . "</h1>";
27+
echo "<h2>" . $cf_caption . "</h2>";
28+
echo '<hr />';
29+
echo '<br /><br />';
30+
}
31+
else
32+
{
33+
//TODO: finish call to create header image from media source listed in settings.php
34+
//echo "<img src=\"" . $st_headerimage . ""\" alt="Mountain View" style="width:304px;height:228px">"
35+
}
36+
?>

index.php

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,5 @@
11
<?php
2-
//required files
3-
//require_once 'sqldata.php';
4-
require_once 'settings.php';
5-
require_once 'styles.php';
6-
7-
8-
//start HTML headers
9-
echo '<html>';
10-
echo '<header>';
11-
echo '<LINK href=\"' . $st_home . '\" rel="stylesheet" type="text/css">';
12-
//add any header information you need such as Google Analytics tracking
13-
echo '</header>';
14-
15-
//start body
16-
if(!$st_bodyimage)
17-
{
18-
echo '<body>';
19-
}
20-
else
21-
{
22-
echo '<body style=\"background-image:url(' . $st_bodyimage . ')\">';
23-
}
24-
if(!$st_headerimage)
25-
{
26-
echo "<h1>" . $cf_title . "</h1>";
27-
echo "<h2>" . $cf_caption . "</h2>";
28-
echo '<hr />';
29-
echo '<br /><br />';
30-
}
31-
else
32-
{
33-
//TODO: finish call to create header image from media source listed in settings.php
34-
//echo "<img src=\"" . $st_headerimage . ""\" alt="Mountain View" style="width:304px;height:228px">"
35-
}
2+
require_once 'header.php';
363

374
//start posts
385
$postdata = simplexml_load_file('posts/index.xml');

posts/1.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This is the first post

posts/1.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<postdata>
2+
<pubdate>
3+
<month>1</month>
4+
<day>20</day>
5+
<year>1999</year>
6+
</pubdate>
7+
</postdata>

posts/a.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

posts/a.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

posts/b.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

posts/index.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<posts>
22
<post>
33
<title>First Post</title>
4-
<content>a.txt</content>
5-
<data>a.xml</data>
6-
<tag>a</tag>
4+
<content>1.txt</content>
5+
<data>1.xml</data>
6+
<tag>1</tag>
77
</post>
88
<post>
99
<title>Second Post</title>
10-
<content>b.txt</content>
11-
<data>b.xml</data>
12-
<tag>b</tag>
10+
<content>2.txt</content>
11+
<data>2.xml</data>
12+
<tag>2</tag>
1313
</post>
1414
</posts>

0 commit comments

Comments
 (0)