diff --git a/www/M3-02-hit.dat b/www/M3-02-hit.dat new file mode 100644 index 0000000..8fdd954 --- /dev/null +++ b/www/M3-02-hit.dat @@ -0,0 +1 @@ +22 \ No newline at end of file diff --git a/www/M3-03-hit.dat b/www/M3-03-hit.dat new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/www/M3-03-hit.dat @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/www/M3-04-hit.dat b/www/M3-04-hit.dat new file mode 100644 index 0000000..bf0d87a --- /dev/null +++ b/www/M3-04-hit.dat @@ -0,0 +1 @@ +4 \ No newline at end of file diff --git a/www/M3-04-messages.dat b/www/M3-04-messages.dat new file mode 100644 index 0000000..8be9d17 --- /dev/null +++ b/www/M3-04-messages.dat @@ -0,0 +1 @@ +

Från: wreqtrthsr

reywtyret

Från: eargnkdsl

earsthy

Från: aeawwtsrthd

agdhsf

Från: argsdn

hsdtrj

Från: ewttr

rerew

Från: nklhio

hiohiohio

Från: jo

jijpnin

Från:

j

Från: joqoapre

dvbilgfb

\ No newline at end of file diff --git a/www/M3-06-hit.dat b/www/M3-06-hit.dat new file mode 100644 index 0000000..bf0d87a --- /dev/null +++ b/www/M3-06-hit.dat @@ -0,0 +1 @@ +4 \ No newline at end of file diff --git a/www/M3-06-users.dat b/www/M3-06-users.dat new file mode 100644 index 0000000..e81d6ca Binary files /dev/null and b/www/M3-06-users.dat differ diff --git a/www/public/M0/01/index.php b/www/public/M0/01/index.php index 15c7699..dc9d1ee 100644 --- a/www/public/M0/01/index.php +++ b/www/public/M0/01/index.php @@ -4,7 +4,7 @@ - Document + M0 | 01

Matematik-test

diff --git a/www/public/M0/03/index.php b/www/public/M0/03/index.php index 8a6b07a..3731bed 100644 --- a/www/public/M0/03/index.php +++ b/www/public/M0/03/index.php @@ -3,7 +3,7 @@ - Responsiv webbdesign + M0 | 03 diff --git a/www/public/M1/01/index.php b/www/public/M1/01/index.php index 553eaee..a456ab4 100644 --- a/www/public/M1/01/index.php +++ b/www/public/M1/01/index.php @@ -3,7 +3,7 @@ - M1-test + M1 | 01
diff --git a/www/public/M1/02/index.php b/www/public/M1/02/index.php index 086e19c..57256b4 100644 --- a/www/public/M1/02/index.php +++ b/www/public/M1/02/index.php @@ -3,7 +3,7 @@ - M1-test + M1 | 02 diff --git a/www/public/M1/03/index.php b/www/public/M1/03/index.php index 04eb928..4cf9fff 100644 --- a/www/public/M1/03/index.php +++ b/www/public/M1/03/index.php @@ -2,7 +2,7 @@ -

Matematik-test

+

M1 | 03

diff --git a/www/public/M2/01/index.php b/www/public/M2/01/index.php index 1375a6f..ae57bff 100644 --- a/www/public/M2/01/index.php +++ b/www/public/M2/01/index.php @@ -3,7 +3,7 @@ - M2 01 + M2 | 01

Send data via url

diff --git a/www/public/M2/02/index.php b/www/public/M2/02/index.php index 7efe76d..a90eaad 100644 --- a/www/public/M2/02/index.php +++ b/www/public/M2/02/index.php @@ -3,7 +3,7 @@ - M2 02 + M2 | 02 - M2 02 + M2 | 03 - M2 02 + M2 | 04 - M2 02 + M2 | 05 diff --git a/www/public/M2/06/cleanData.php b/www/public/M2/06/cleanData.php new file mode 100644 index 0000000..4bf5061 --- /dev/null +++ b/www/public/M2/06/cleanData.php @@ -0,0 +1,8 @@ + "; echo "Username: " . $username . "
"; echo "Password: " . $password . "
"; - - function cleanData($data) { - $data = strip_tags($data); - $data = htmlspecialchars($data); - $data = trim($data); - $data = stripslashes($data); - return $data; - } ?> \ No newline at end of file diff --git a/www/public/M2/06/index.php b/www/public/M2/06/index.php index 8cf6914..30bd255 100644 --- a/www/public/M2/06/index.php +++ b/www/public/M2/06/index.php @@ -3,7 +3,7 @@ - M2 02 + M2 | 06 diff --git a/www/public/M2/07/index.php b/www/public/M2/07/index.php index 67f7ef7..a8949c3 100644 --- a/www/public/M2/07/index.php +++ b/www/public/M2/07/index.php @@ -3,7 +3,7 @@ - M2 02 + M2 | 07 password; } - public function saetUsername($username) { + public function setUsername($username) { $this->username = $username; } diff --git a/www/public/M2/08/index.php b/www/public/M2/08/index.php index ab51959..ddf8e42 100644 --- a/www/public/M2/08/index.php +++ b/www/public/M2/08/index.php @@ -3,7 +3,7 @@ - M2 08 + M2 | 08 diff --git a/www/public/M2/09/User.php b/www/public/M2/09/User.php index e1152c1..afa0130 100644 --- a/www/public/M2/09/User.php +++ b/www/public/M2/09/User.php @@ -18,7 +18,7 @@ class User return $this->password; } - public function saetUsername($username) { + public function setUsername($username) { $this->username = $username; } diff --git a/www/public/M2/09/handle.php b/www/public/M2/09/handle.php index bb4efa3..a33f90c 100644 --- a/www/public/M2/09/handle.php +++ b/www/public/M2/09/handle.php @@ -30,6 +30,7 @@ header("Location: index.php"); exit(); } + function cleanData($data) { diff --git a/www/public/M2/09/index.php b/www/public/M2/09/index.php index c8362ee..a5a6731 100644 --- a/www/public/M2/09/index.php +++ b/www/public/M2/09/index.php @@ -4,7 +4,7 @@ - M2 08 + M2 | 09 diff --git a/www/public/M3/01/bilder/bgImg.png b/www/public/M3/01/bilder/bgImg.png new file mode 100755 index 0000000..44d2902 Binary files /dev/null and b/www/public/M3/01/bilder/bgImg.png differ diff --git a/www/public/M3/01/css/styleSheet.css b/www/public/M3/01/css/styleSheet.css new file mode 100755 index 0000000..e03f6c1 --- /dev/null +++ b/www/public/M3/01/css/styleSheet.css @@ -0,0 +1,137 @@ +@CHARSET "UTF-8"; +* { + margin:0; + padding:0; + font-family:Verdana, Geneva, sans-serif; +} +body{ + font-size: 100%; +} +p { + font-size: 0.8em; + margin-bottom: 10px; + margin-top: 5px; + margin-right: 10px; + text-align: justify; +} + +/* Wrapper */ +#wrapper { + width: 800px; + margin-left: auto; + margin-right:auto; + margin-top:10px; + border: 2px solid rgba(0,0,0,0.8); +} +/* End wrapper */ + +/* Header */ +header { + text-align:center; + height: 60px; + background-image: url("../bilder/bgImg.png"); + + color: white; +} +header h1{ + font-family: Arial; + font-size: 1.9em; + padding-top: 0.25em; +} + +header time{ + float: right; + margin-right: 2em; + font-size: 0.8em; +} +/* End header */ + +nav{ + border-radius: 5px; /* CSS3 */ + border: 1px solid #999; + padding: 4px; + margin-bottom:5px; +} +nav ul { + list-style:none; +} +nav li{ + margin-top: 5px; + border: 1px solid #000; +} +nav li a{ + display:block; + font-size: 0.8em; + text-decoration: none; + color: #aa0000; + padding-left: 15px; + background-color:#FFC; +} +nav li a:hover, #leftColumn li a:active, #leftColumn li a:focus{ + background-color: gray; + color: #ffffff; +} + +aside { + -moz-border-radius: 5px; /* Ger rundade hörn i Firefox */ + border-radius: 5px; /* CSS3 */ + border: 1px solid #999; + padding: 4px; + margin-bottom:5px; +} + +aside p { + font-size: 0.8em; +} + +/* leftColumn */ +#leftColumn { + float: left; + width: 180px; + margin: 8px; +} + +#leftColumn h1 { + font-family:Arial, Helvetica, sans-serif; + font-size: 0.9em; +} +/* End leftColumn */ +/* Main */ +main { + margin-top: 8px; + margin-left:200px; +} +main h1{ + font-family: Arial, Helvetica, sans-serif; + font-size: 1.4em; +} +main h2{ + font-family: Arial, Helvetica, sans-serif; + font-size: 1.1em; +} +main section{ + float:right; + width: 99%; +} + +form label,a{ + font-size: 0.8em; +} +/* End content */ +/* Footer */ +footer { + height: 30px; + background-image: url("../bilder/bgImg.png"); + color: white; + font-size: 0.75em; + clear:both; +} +footer #footerRight{ + float:right; + padding: 5px; +} +footer #footerLeft{ + float:left; + padding: 5px; +} +/* End footer */ \ No newline at end of file diff --git a/www/public/M3/01/inc/aside.php b/www/public/M3/01/inc/aside.php new file mode 100644 index 0000000..1e8c4c4 --- /dev/null +++ b/www/public/M3/01/inc/aside.php @@ -0,0 +1,4 @@ +
  • Lorem ipsum dolor sit amet.
    • +
  • Lorem ipsum dolor sit amet.
    • +
  • Lorem ipsum dolor sit amet.
    • +
  • Lorem ipsum dolor sit amet.
    • \ No newline at end of file diff --git a/www/public/M3/01/inc/footer.php b/www/public/M3/01/inc/footer.php new file mode 100644 index 0000000..6d8c88f --- /dev/null +++ b/www/public/M3/01/inc/footer.php @@ -0,0 +1,9 @@ + + \ No newline at end of file diff --git a/www/public/M3/01/inc/header.php b/www/public/M3/01/inc/header.php new file mode 100644 index 0000000..10598cb --- /dev/null +++ b/www/public/M3/01/inc/header.php @@ -0,0 +1,5 @@ +

    Webbserverprogrammering 1 med Bygren

    + $date "; +?> \ No newline at end of file diff --git a/www/public/M3/01/inc/meny.php b/www/public/M3/01/inc/meny.php new file mode 100644 index 0000000..999496a --- /dev/null +++ b/www/public/M3/01/inc/meny.php @@ -0,0 +1,7 @@ +

    Innehåll

    + \ No newline at end of file diff --git a/www/public/M3/01/index.php b/www/public/M3/01/index.php new file mode 100644 index 0000000..efaf7a2 --- /dev/null +++ b/www/public/M3/01/index.php @@ -0,0 +1,56 @@ + + + + + Länka in med PHP + + + +
    +
    + +
    + + +
    + + +
    + + +
    +
    + + + +
    +
    + + +
    + +
    + +
    + + + \ No newline at end of file diff --git a/www/public/M3/01/pages/bilder.php b/www/public/M3/01/pages/bilder.php new file mode 100644 index 0000000..6e20174 --- /dev/null +++ b/www/public/M3/01/pages/bilder.php @@ -0,0 +1,5 @@ +

    My gallery

    +

    *Photo*

    +

    *Photo*

    +

    *Photo*

    +

    *Photo*

    \ No newline at end of file diff --git a/www/public/M3/01/pages/blogg.php b/www/public/M3/01/pages/blogg.php new file mode 100644 index 0000000..eb90d37 --- /dev/null +++ b/www/public/M3/01/pages/blogg.php @@ -0,0 +1,9 @@ +
    +

    Min blogg Nu

    +

    I dag gör vi mallar

    +
    +

    Lorem ipsum id duo autem qualisque, cu laoreet eleifend cum. Eu sea + vidit altera civibus, harum deserunt argumentum ne vim. Eu paulo + corpora appareat pro, brute everti iuvaret ne vis. Diam incorrupte + voluptatibus cu vel, nam congue soluta praesent at. +

    \ No newline at end of file diff --git a/www/public/M3/01/pages/kontakt.php b/www/public/M3/01/pages/kontakt.php new file mode 100644 index 0000000..b306a2a --- /dev/null +++ b/www/public/M3/01/pages/kontakt.php @@ -0,0 +1,4 @@ +

    My contacts

    +

    First contact

    +

    2nd contact

    +

    3rd contact

    \ No newline at end of file diff --git a/www/public/M3/01/pages/start.php b/www/public/M3/01/pages/start.php new file mode 100644 index 0000000..69b3aef --- /dev/null +++ b/www/public/M3/01/pages/start.php @@ -0,0 +1,3 @@ +

    Välkommen till Webbserverprogrammering 1

    +

    Moment 2

    +

    Vi kommer använda include() för att länka in sidor i vår mall.

    \ No newline at end of file diff --git a/www/public/M3/02/bilder/bgImg.png b/www/public/M3/02/bilder/bgImg.png new file mode 100755 index 0000000..44d2902 Binary files /dev/null and b/www/public/M3/02/bilder/bgImg.png differ diff --git a/www/public/M3/02/css/styleSheet.css b/www/public/M3/02/css/styleSheet.css new file mode 100755 index 0000000..e03f6c1 --- /dev/null +++ b/www/public/M3/02/css/styleSheet.css @@ -0,0 +1,137 @@ +@CHARSET "UTF-8"; +* { + margin:0; + padding:0; + font-family:Verdana, Geneva, sans-serif; +} +body{ + font-size: 100%; +} +p { + font-size: 0.8em; + margin-bottom: 10px; + margin-top: 5px; + margin-right: 10px; + text-align: justify; +} + +/* Wrapper */ +#wrapper { + width: 800px; + margin-left: auto; + margin-right:auto; + margin-top:10px; + border: 2px solid rgba(0,0,0,0.8); +} +/* End wrapper */ + +/* Header */ +header { + text-align:center; + height: 60px; + background-image: url("../bilder/bgImg.png"); + + color: white; +} +header h1{ + font-family: Arial; + font-size: 1.9em; + padding-top: 0.25em; +} + +header time{ + float: right; + margin-right: 2em; + font-size: 0.8em; +} +/* End header */ + +nav{ + border-radius: 5px; /* CSS3 */ + border: 1px solid #999; + padding: 4px; + margin-bottom:5px; +} +nav ul { + list-style:none; +} +nav li{ + margin-top: 5px; + border: 1px solid #000; +} +nav li a{ + display:block; + font-size: 0.8em; + text-decoration: none; + color: #aa0000; + padding-left: 15px; + background-color:#FFC; +} +nav li a:hover, #leftColumn li a:active, #leftColumn li a:focus{ + background-color: gray; + color: #ffffff; +} + +aside { + -moz-border-radius: 5px; /* Ger rundade hörn i Firefox */ + border-radius: 5px; /* CSS3 */ + border: 1px solid #999; + padding: 4px; + margin-bottom:5px; +} + +aside p { + font-size: 0.8em; +} + +/* leftColumn */ +#leftColumn { + float: left; + width: 180px; + margin: 8px; +} + +#leftColumn h1 { + font-family:Arial, Helvetica, sans-serif; + font-size: 0.9em; +} +/* End leftColumn */ +/* Main */ +main { + margin-top: 8px; + margin-left:200px; +} +main h1{ + font-family: Arial, Helvetica, sans-serif; + font-size: 1.4em; +} +main h2{ + font-family: Arial, Helvetica, sans-serif; + font-size: 1.1em; +} +main section{ + float:right; + width: 99%; +} + +form label,a{ + font-size: 0.8em; +} +/* End content */ +/* Footer */ +footer { + height: 30px; + background-image: url("../bilder/bgImg.png"); + color: white; + font-size: 0.75em; + clear:both; +} +footer #footerRight{ + float:right; + padding: 5px; +} +footer #footerLeft{ + float:left; + padding: 5px; +} +/* End footer */ \ No newline at end of file diff --git a/www/public/M3/02/inc/aside.php b/www/public/M3/02/inc/aside.php new file mode 100644 index 0000000..1e8c4c4 --- /dev/null +++ b/www/public/M3/02/inc/aside.php @@ -0,0 +1,4 @@ +
  • Lorem ipsum dolor sit amet.
    • +
  • Lorem ipsum dolor sit amet.
    • +
  • Lorem ipsum dolor sit amet.
    • +
  • Lorem ipsum dolor sit amet.
    • \ No newline at end of file diff --git a/www/public/M3/02/inc/footer.php b/www/public/M3/02/inc/footer.php new file mode 100644 index 0000000..6d8c88f --- /dev/null +++ b/www/public/M3/02/inc/footer.php @@ -0,0 +1,9 @@ + + \ No newline at end of file diff --git a/www/public/M3/02/inc/header.php b/www/public/M3/02/inc/header.php new file mode 100644 index 0000000..10598cb --- /dev/null +++ b/www/public/M3/02/inc/header.php @@ -0,0 +1,5 @@ +

    Webbserverprogrammering 1 med Bygren

    + $date "; +?> \ No newline at end of file diff --git a/www/public/M3/02/inc/meny.php b/www/public/M3/02/inc/meny.php new file mode 100644 index 0000000..999496a --- /dev/null +++ b/www/public/M3/02/inc/meny.php @@ -0,0 +1,7 @@ +

    Innehåll

    + \ No newline at end of file diff --git a/www/public/M3/02/index.php b/www/public/M3/02/index.php new file mode 100644 index 0000000..af38e30 --- /dev/null +++ b/www/public/M3/02/index.php @@ -0,0 +1,74 @@ + + + + + + Länka in med PHP + + + + +
    +
    + +
    + + +
    + + +
    + + +
    +
    + + + +
    +
    + + +
    + +
    + +
    + + + \ No newline at end of file diff --git a/www/public/M3/02/pages/bilder.php b/www/public/M3/02/pages/bilder.php new file mode 100644 index 0000000..6e20174 --- /dev/null +++ b/www/public/M3/02/pages/bilder.php @@ -0,0 +1,5 @@ +

    My gallery

    +

    *Photo*

    +

    *Photo*

    +

    *Photo*

    +

    *Photo*

    \ No newline at end of file diff --git a/www/public/M3/02/pages/blogg.php b/www/public/M3/02/pages/blogg.php new file mode 100644 index 0000000..eb90d37 --- /dev/null +++ b/www/public/M3/02/pages/blogg.php @@ -0,0 +1,9 @@ +
    +

    Min blogg Nu

    +

    I dag gör vi mallar

    +
    +

    Lorem ipsum id duo autem qualisque, cu laoreet eleifend cum. Eu sea + vidit altera civibus, harum deserunt argumentum ne vim. Eu paulo + corpora appareat pro, brute everti iuvaret ne vis. Diam incorrupte + voluptatibus cu vel, nam congue soluta praesent at. +

    \ No newline at end of file diff --git a/www/public/M3/02/pages/kontakt.php b/www/public/M3/02/pages/kontakt.php new file mode 100644 index 0000000..b306a2a --- /dev/null +++ b/www/public/M3/02/pages/kontakt.php @@ -0,0 +1,4 @@ +

    My contacts

    +

    First contact

    +

    2nd contact

    +

    3rd contact

    \ No newline at end of file diff --git a/www/public/M3/02/pages/start.php b/www/public/M3/02/pages/start.php new file mode 100644 index 0000000..69b3aef --- /dev/null +++ b/www/public/M3/02/pages/start.php @@ -0,0 +1,3 @@ +

    Välkommen till Webbserverprogrammering 1

    +

    Moment 2

    +

    Vi kommer använda include() för att länka in sidor i vår mall.

    \ No newline at end of file diff --git a/www/public/M3/03/bilder/bgImg.png b/www/public/M3/03/bilder/bgImg.png new file mode 100755 index 0000000..44d2902 Binary files /dev/null and b/www/public/M3/03/bilder/bgImg.png differ diff --git a/www/public/M3/03/css/styleSheet.css b/www/public/M3/03/css/styleSheet.css new file mode 100755 index 0000000..e03f6c1 --- /dev/null +++ b/www/public/M3/03/css/styleSheet.css @@ -0,0 +1,137 @@ +@CHARSET "UTF-8"; +* { + margin:0; + padding:0; + font-family:Verdana, Geneva, sans-serif; +} +body{ + font-size: 100%; +} +p { + font-size: 0.8em; + margin-bottom: 10px; + margin-top: 5px; + margin-right: 10px; + text-align: justify; +} + +/* Wrapper */ +#wrapper { + width: 800px; + margin-left: auto; + margin-right:auto; + margin-top:10px; + border: 2px solid rgba(0,0,0,0.8); +} +/* End wrapper */ + +/* Header */ +header { + text-align:center; + height: 60px; + background-image: url("../bilder/bgImg.png"); + + color: white; +} +header h1{ + font-family: Arial; + font-size: 1.9em; + padding-top: 0.25em; +} + +header time{ + float: right; + margin-right: 2em; + font-size: 0.8em; +} +/* End header */ + +nav{ + border-radius: 5px; /* CSS3 */ + border: 1px solid #999; + padding: 4px; + margin-bottom:5px; +} +nav ul { + list-style:none; +} +nav li{ + margin-top: 5px; + border: 1px solid #000; +} +nav li a{ + display:block; + font-size: 0.8em; + text-decoration: none; + color: #aa0000; + padding-left: 15px; + background-color:#FFC; +} +nav li a:hover, #leftColumn li a:active, #leftColumn li a:focus{ + background-color: gray; + color: #ffffff; +} + +aside { + -moz-border-radius: 5px; /* Ger rundade hörn i Firefox */ + border-radius: 5px; /* CSS3 */ + border: 1px solid #999; + padding: 4px; + margin-bottom:5px; +} + +aside p { + font-size: 0.8em; +} + +/* leftColumn */ +#leftColumn { + float: left; + width: 180px; + margin: 8px; +} + +#leftColumn h1 { + font-family:Arial, Helvetica, sans-serif; + font-size: 0.9em; +} +/* End leftColumn */ +/* Main */ +main { + margin-top: 8px; + margin-left:200px; +} +main h1{ + font-family: Arial, Helvetica, sans-serif; + font-size: 1.4em; +} +main h2{ + font-family: Arial, Helvetica, sans-serif; + font-size: 1.1em; +} +main section{ + float:right; + width: 99%; +} + +form label,a{ + font-size: 0.8em; +} +/* End content */ +/* Footer */ +footer { + height: 30px; + background-image: url("../bilder/bgImg.png"); + color: white; + font-size: 0.75em; + clear:both; +} +footer #footerRight{ + float:right; + padding: 5px; +} +footer #footerLeft{ + float:left; + padding: 5px; +} +/* End footer */ \ No newline at end of file diff --git a/www/public/M3/03/inc/aside.php b/www/public/M3/03/inc/aside.php new file mode 100644 index 0000000..1e8c4c4 --- /dev/null +++ b/www/public/M3/03/inc/aside.php @@ -0,0 +1,4 @@ +
  • Lorem ipsum dolor sit amet.
    • +
  • Lorem ipsum dolor sit amet.
    • +
  • Lorem ipsum dolor sit amet.
    • +
  • Lorem ipsum dolor sit amet.
    • \ No newline at end of file diff --git a/www/public/M3/03/inc/footer.php b/www/public/M3/03/inc/footer.php new file mode 100644 index 0000000..6d8c88f --- /dev/null +++ b/www/public/M3/03/inc/footer.php @@ -0,0 +1,9 @@ + + \ No newline at end of file diff --git a/www/public/M3/03/inc/header.php b/www/public/M3/03/inc/header.php new file mode 100644 index 0000000..10598cb --- /dev/null +++ b/www/public/M3/03/inc/header.php @@ -0,0 +1,5 @@ +

    Webbserverprogrammering 1 med Bygren

    + $date "; +?> \ No newline at end of file diff --git a/www/public/M3/03/inc/meny.php b/www/public/M3/03/inc/meny.php new file mode 100644 index 0000000..92ee5a9 --- /dev/null +++ b/www/public/M3/03/inc/meny.php @@ -0,0 +1,8 @@ +

    Innehåll

    + \ No newline at end of file diff --git a/www/public/M3/03/index.php b/www/public/M3/03/index.php new file mode 100644 index 0000000..af94ad5 --- /dev/null +++ b/www/public/M3/03/index.php @@ -0,0 +1,106 @@ + + + + + + + Länka in med PHP + + + + +
    +
    + +
    + + +
    + + +
    + + + + +
    +
    + + +
    +
    + + +
    + +
    + + +
    + + + \ No newline at end of file diff --git a/www/public/M3/03/login.php b/www/public/M3/03/login.php new file mode 100644 index 0000000..c367978 --- /dev/null +++ b/www/public/M3/03/login.php @@ -0,0 +1,44 @@ + + + + + + Login + + + +
    + Login + + +

    + +

    + +
    + + +
    +
    + Signup + + +

    + +

    + +
    +
    + +
    +
    + +
    +
    + Logout + + +
    +
    + + \ No newline at end of file diff --git a/www/public/M3/03/pages/bilder.php b/www/public/M3/03/pages/bilder.php new file mode 100644 index 0000000..1042a9b --- /dev/null +++ b/www/public/M3/03/pages/bilder.php @@ -0,0 +1,12 @@ +No login "; +} +else { +?> +

    My gallery

    +

    *Photo*

    +

    *Photo*

    +

    *Photo*

    +

    *Photo*

    + \ No newline at end of file diff --git a/www/public/M3/03/pages/blogg.php b/www/public/M3/03/pages/blogg.php new file mode 100644 index 0000000..6a80e45 --- /dev/null +++ b/www/public/M3/03/pages/blogg.php @@ -0,0 +1,16 @@ +No login "; +} +else { +?> +
    +

    Min blogg Nu

    +

    I dag gör vi mallar

    +
    +

    Lorem ipsum id duo autem qualisque, cu laoreet eleifend cum. Eu sea + vidit altera civibus, harum deserunt argumentum ne vim. Eu paulo + corpora appareat pro, brute everti iuvaret ne vis. Diam incorrupte + voluptatibus cu vel, nam congue soluta praesent at. +

    + \ No newline at end of file diff --git a/www/public/M3/03/pages/kontakt.php b/www/public/M3/03/pages/kontakt.php new file mode 100644 index 0000000..7cc4e79 --- /dev/null +++ b/www/public/M3/03/pages/kontakt.php @@ -0,0 +1,11 @@ +No login "; +} +else { +?> +

    My contacts

    +

    First contact

    +

    2nd contact

    +

    3rd contact

    + \ No newline at end of file diff --git a/www/public/M3/03/pages/start.php b/www/public/M3/03/pages/start.php new file mode 100644 index 0000000..fe365ac --- /dev/null +++ b/www/public/M3/03/pages/start.php @@ -0,0 +1,10 @@ +No login "; +} +else { +?> +

    Välkommen till Webbserverprogrammering 1

    +

    Moment 2

    +

    Vi kommer använda include() för att länka in sidor i vår mall.

    + \ No newline at end of file diff --git a/www/public/M3/04/bilder/bgImg.png b/www/public/M3/04/bilder/bgImg.png new file mode 100755 index 0000000..44d2902 Binary files /dev/null and b/www/public/M3/04/bilder/bgImg.png differ diff --git a/www/public/M3/04/css/styleSheet.css b/www/public/M3/04/css/styleSheet.css new file mode 100755 index 0000000..e03f6c1 --- /dev/null +++ b/www/public/M3/04/css/styleSheet.css @@ -0,0 +1,137 @@ +@CHARSET "UTF-8"; +* { + margin:0; + padding:0; + font-family:Verdana, Geneva, sans-serif; +} +body{ + font-size: 100%; +} +p { + font-size: 0.8em; + margin-bottom: 10px; + margin-top: 5px; + margin-right: 10px; + text-align: justify; +} + +/* Wrapper */ +#wrapper { + width: 800px; + margin-left: auto; + margin-right:auto; + margin-top:10px; + border: 2px solid rgba(0,0,0,0.8); +} +/* End wrapper */ + +/* Header */ +header { + text-align:center; + height: 60px; + background-image: url("../bilder/bgImg.png"); + + color: white; +} +header h1{ + font-family: Arial; + font-size: 1.9em; + padding-top: 0.25em; +} + +header time{ + float: right; + margin-right: 2em; + font-size: 0.8em; +} +/* End header */ + +nav{ + border-radius: 5px; /* CSS3 */ + border: 1px solid #999; + padding: 4px; + margin-bottom:5px; +} +nav ul { + list-style:none; +} +nav li{ + margin-top: 5px; + border: 1px solid #000; +} +nav li a{ + display:block; + font-size: 0.8em; + text-decoration: none; + color: #aa0000; + padding-left: 15px; + background-color:#FFC; +} +nav li a:hover, #leftColumn li a:active, #leftColumn li a:focus{ + background-color: gray; + color: #ffffff; +} + +aside { + -moz-border-radius: 5px; /* Ger rundade hörn i Firefox */ + border-radius: 5px; /* CSS3 */ + border: 1px solid #999; + padding: 4px; + margin-bottom:5px; +} + +aside p { + font-size: 0.8em; +} + +/* leftColumn */ +#leftColumn { + float: left; + width: 180px; + margin: 8px; +} + +#leftColumn h1 { + font-family:Arial, Helvetica, sans-serif; + font-size: 0.9em; +} +/* End leftColumn */ +/* Main */ +main { + margin-top: 8px; + margin-left:200px; +} +main h1{ + font-family: Arial, Helvetica, sans-serif; + font-size: 1.4em; +} +main h2{ + font-family: Arial, Helvetica, sans-serif; + font-size: 1.1em; +} +main section{ + float:right; + width: 99%; +} + +form label,a{ + font-size: 0.8em; +} +/* End content */ +/* Footer */ +footer { + height: 30px; + background-image: url("../bilder/bgImg.png"); + color: white; + font-size: 0.75em; + clear:both; +} +footer #footerRight{ + float:right; + padding: 5px; +} +footer #footerLeft{ + float:left; + padding: 5px; +} +/* End footer */ \ No newline at end of file diff --git a/www/public/M3/04/inc/aside.php b/www/public/M3/04/inc/aside.php new file mode 100644 index 0000000..1e8c4c4 --- /dev/null +++ b/www/public/M3/04/inc/aside.php @@ -0,0 +1,4 @@ +
  • Lorem ipsum dolor sit amet.
    • +
  • Lorem ipsum dolor sit amet.
    • +
  • Lorem ipsum dolor sit amet.
    • +
  • Lorem ipsum dolor sit amet.
    • \ No newline at end of file diff --git a/www/public/M3/04/inc/footer.php b/www/public/M3/04/inc/footer.php new file mode 100644 index 0000000..6d8c88f --- /dev/null +++ b/www/public/M3/04/inc/footer.php @@ -0,0 +1,9 @@ + + \ No newline at end of file diff --git a/www/public/M3/04/inc/header.php b/www/public/M3/04/inc/header.php new file mode 100644 index 0000000..10598cb --- /dev/null +++ b/www/public/M3/04/inc/header.php @@ -0,0 +1,5 @@ +

    Webbserverprogrammering 1 med Bygren

    + $date "; +?> \ No newline at end of file diff --git a/www/public/M3/04/inc/meny.php b/www/public/M3/04/inc/meny.php new file mode 100644 index 0000000..cc44302 --- /dev/null +++ b/www/public/M3/04/inc/meny.php @@ -0,0 +1,13 @@ +

    Innehåll

    + \ No newline at end of file diff --git a/www/public/M3/04/index.php b/www/public/M3/04/index.php new file mode 100644 index 0000000..4dee2bb --- /dev/null +++ b/www/public/M3/04/index.php @@ -0,0 +1,111 @@ + + + + + + + Länka in med PHP + + + + +
    +
    + +
    + + +
    + + +
    + + + + +
    +
    + + +
    +
    + + +
    + +
    + + +
    + + + \ No newline at end of file diff --git a/www/public/M3/04/login.php b/www/public/M3/04/login.php new file mode 100644 index 0000000..c367978 --- /dev/null +++ b/www/public/M3/04/login.php @@ -0,0 +1,44 @@ + + + + + + Login + + +
    +
    + Login + + +

    + +

    + +
    +
    + +
    +
    + Signup + + +

    + +

    + +
    +
    + +
    +
    + +
    +
    + Logout + + +
    +
    + + \ No newline at end of file diff --git a/www/public/M3/04/pages/bilder.php b/www/public/M3/04/pages/bilder.php new file mode 100644 index 0000000..1042a9b --- /dev/null +++ b/www/public/M3/04/pages/bilder.php @@ -0,0 +1,12 @@ +No login "; +} +else { +?> +

    My gallery

    +

    *Photo*

    +

    *Photo*

    +

    *Photo*

    +

    *Photo*

    + \ No newline at end of file diff --git a/www/public/M3/04/pages/blogg.php b/www/public/M3/04/pages/blogg.php new file mode 100644 index 0000000..6a80e45 --- /dev/null +++ b/www/public/M3/04/pages/blogg.php @@ -0,0 +1,16 @@ +No login "; +} +else { +?> +
    +

    Min blogg Nu

    +

    I dag gör vi mallar

    +
    +

    Lorem ipsum id duo autem qualisque, cu laoreet eleifend cum. Eu sea + vidit altera civibus, harum deserunt argumentum ne vim. Eu paulo + corpora appareat pro, brute everti iuvaret ne vis. Diam incorrupte + voluptatibus cu vel, nam congue soluta praesent at. +

    + \ No newline at end of file diff --git a/www/public/M3/04/pages/klotter.php b/www/public/M3/04/pages/klotter.php new file mode 100644 index 0000000..d2b6df4 --- /dev/null +++ b/www/public/M3/04/pages/klotter.php @@ -0,0 +1,22 @@ +No login "; +} +else { +?> +

    Klotterplanket

    +
    +
    +
    + +
    +
    + +
    + + \ No newline at end of file diff --git a/www/public/M3/04/pages/kontakt.php b/www/public/M3/04/pages/kontakt.php new file mode 100644 index 0000000..7cc4e79 --- /dev/null +++ b/www/public/M3/04/pages/kontakt.php @@ -0,0 +1,11 @@ +No login "; +} +else { +?> +

    My contacts

    +

    First contact

    +

    2nd contact

    +

    3rd contact

    + \ No newline at end of file diff --git a/www/public/M3/04/pages/start.php b/www/public/M3/04/pages/start.php new file mode 100644 index 0000000..fe365ac --- /dev/null +++ b/www/public/M3/04/pages/start.php @@ -0,0 +1,10 @@ +No login "; +} +else { +?> +

    Välkommen till Webbserverprogrammering 1

    +

    Moment 2

    +

    Vi kommer använda include() för att länka in sidor i vår mall.

    + \ No newline at end of file diff --git a/www/public/M3/04/saveMsg.php b/www/public/M3/04/saveMsg.php new file mode 100644 index 0000000..0fd3790 --- /dev/null +++ b/www/public/M3/04/saveMsg.php @@ -0,0 +1,8 @@ +

    Från: " . $_POST['name'] . "

    "; + $msg = "

    " . $_POST['message'] . "

    "; + + file_put_contents("../../../M3-04-messages.dat",$name.$msg,FILE_APPEND); + + header("location: index.php?page=klotter"); //Omdirigerar till klotterplanket +?> \ No newline at end of file diff --git a/www/public/M3/06/User.php b/www/public/M3/06/User.php new file mode 100644 index 0000000..afa0130 --- /dev/null +++ b/www/public/M3/06/User.php @@ -0,0 +1,28 @@ +username = $username; + $this->password = $password; + } + + public function getUsername() { + return $this->username; + } + + public function getPassword() { + return $this->password; + } + + public function setUsername($username) { + $this->username = $username; + } + + public function setPassword($password) { + $this->password = $password; + } +} diff --git a/www/public/M3/06/bilder/bgImg.png b/www/public/M3/06/bilder/bgImg.png new file mode 100755 index 0000000..44d2902 Binary files /dev/null and b/www/public/M3/06/bilder/bgImg.png differ diff --git a/www/public/M3/06/css/styleSheet.css b/www/public/M3/06/css/styleSheet.css new file mode 100755 index 0000000..e03f6c1 --- /dev/null +++ b/www/public/M3/06/css/styleSheet.css @@ -0,0 +1,137 @@ +@CHARSET "UTF-8"; +* { + margin:0; + padding:0; + font-family:Verdana, Geneva, sans-serif; +} +body{ + font-size: 100%; +} +p { + font-size: 0.8em; + margin-bottom: 10px; + margin-top: 5px; + margin-right: 10px; + text-align: justify; +} + +/* Wrapper */ +#wrapper { + width: 800px; + margin-left: auto; + margin-right:auto; + margin-top:10px; + border: 2px solid rgba(0,0,0,0.8); +} +/* End wrapper */ + +/* Header */ +header { + text-align:center; + height: 60px; + background-image: url("../bilder/bgImg.png"); + + color: white; +} +header h1{ + font-family: Arial; + font-size: 1.9em; + padding-top: 0.25em; +} + +header time{ + float: right; + margin-right: 2em; + font-size: 0.8em; +} +/* End header */ + +nav{ + border-radius: 5px; /* CSS3 */ + border: 1px solid #999; + padding: 4px; + margin-bottom:5px; +} +nav ul { + list-style:none; +} +nav li{ + margin-top: 5px; + border: 1px solid #000; +} +nav li a{ + display:block; + font-size: 0.8em; + text-decoration: none; + color: #aa0000; + padding-left: 15px; + background-color:#FFC; +} +nav li a:hover, #leftColumn li a:active, #leftColumn li a:focus{ + background-color: gray; + color: #ffffff; +} + +aside { + -moz-border-radius: 5px; /* Ger rundade hörn i Firefox */ + border-radius: 5px; /* CSS3 */ + border: 1px solid #999; + padding: 4px; + margin-bottom:5px; +} + +aside p { + font-size: 0.8em; +} + +/* leftColumn */ +#leftColumn { + float: left; + width: 180px; + margin: 8px; +} + +#leftColumn h1 { + font-family:Arial, Helvetica, sans-serif; + font-size: 0.9em; +} +/* End leftColumn */ +/* Main */ +main { + margin-top: 8px; + margin-left:200px; +} +main h1{ + font-family: Arial, Helvetica, sans-serif; + font-size: 1.4em; +} +main h2{ + font-family: Arial, Helvetica, sans-serif; + font-size: 1.1em; +} +main section{ + float:right; + width: 99%; +} + +form label,a{ + font-size: 0.8em; +} +/* End content */ +/* Footer */ +footer { + height: 30px; + background-image: url("../bilder/bgImg.png"); + color: white; + font-size: 0.75em; + clear:both; +} +footer #footerRight{ + float:right; + padding: 5px; +} +footer #footerLeft{ + float:left; + padding: 5px; +} +/* End footer */ \ No newline at end of file diff --git a/www/public/M3/06/handle.php b/www/public/M3/06/handle.php new file mode 100644 index 0000000..b13fb48 --- /dev/null +++ b/www/public/M3/06/handle.php @@ -0,0 +1,46 @@ + + + + + + + M3 06 + + + + getUsername(); + echo "
    Pass: " . $user->getPassword(); + } else { + header("Location: index.php"); + exit(); + } + } + else if(isset($_POST["signup"])) { + addUser($user); + header("Location: index.php"); + exit(); + } + + + function cleanData($data) + { + $data = strip_tags($data); + $data = htmlspecialchars($data); + $data = trim($data); + $data = stripslashes($data); + return $data; + } + ?> + + + \ No newline at end of file diff --git a/www/public/M3/06/inc/aside.php b/www/public/M3/06/inc/aside.php new file mode 100644 index 0000000..1e8c4c4 --- /dev/null +++ b/www/public/M3/06/inc/aside.php @@ -0,0 +1,4 @@ +
  • Lorem ipsum dolor sit amet.
    • +
  • Lorem ipsum dolor sit amet.
    • +
  • Lorem ipsum dolor sit amet.
    • +
  • Lorem ipsum dolor sit amet.
    • \ No newline at end of file diff --git a/www/public/M3/06/inc/footer.php b/www/public/M3/06/inc/footer.php new file mode 100644 index 0000000..6d8c88f --- /dev/null +++ b/www/public/M3/06/inc/footer.php @@ -0,0 +1,9 @@ + + \ No newline at end of file diff --git a/www/public/M3/06/inc/header.php b/www/public/M3/06/inc/header.php new file mode 100644 index 0000000..10598cb --- /dev/null +++ b/www/public/M3/06/inc/header.php @@ -0,0 +1,5 @@ +

    Webbserverprogrammering 1 med Bygren

    + $date "; +?> \ No newline at end of file diff --git a/www/public/M3/06/inc/meny.php b/www/public/M3/06/inc/meny.php new file mode 100644 index 0000000..cc44302 --- /dev/null +++ b/www/public/M3/06/inc/meny.php @@ -0,0 +1,13 @@ +

    Innehåll

    + \ No newline at end of file diff --git a/www/public/M3/06/index.php b/www/public/M3/06/index.php new file mode 100644 index 0000000..b5210a4 --- /dev/null +++ b/www/public/M3/06/index.php @@ -0,0 +1,153 @@ + + + + + + + Länka in med PHP + + + + +
    +
    + +
    + + +
    + + +
    + + + + +
    +
    + + +
    +
    + + +
    + +
    + + +
    + + + + \ No newline at end of file diff --git a/www/public/M3/06/login.php b/www/public/M3/06/login.php new file mode 100644 index 0000000..c367978 --- /dev/null +++ b/www/public/M3/06/login.php @@ -0,0 +1,44 @@ + + + + + + Login + + +
    +
    + Login + + +

    + +

    + +
    +
    + +
    +
    + Signup + + +

    + +

    + +
    +
    + +
    +
    + +
    +
    + Logout + + +
    +
    + + \ No newline at end of file diff --git a/www/public/M3/06/pages/bilder.php b/www/public/M3/06/pages/bilder.php new file mode 100644 index 0000000..1042a9b --- /dev/null +++ b/www/public/M3/06/pages/bilder.php @@ -0,0 +1,12 @@ +No login "; +} +else { +?> +

    My gallery

    +

    *Photo*

    +

    *Photo*

    +

    *Photo*

    +

    *Photo*

    + \ No newline at end of file diff --git a/www/public/M3/06/pages/blogg.php b/www/public/M3/06/pages/blogg.php new file mode 100644 index 0000000..6a80e45 --- /dev/null +++ b/www/public/M3/06/pages/blogg.php @@ -0,0 +1,16 @@ +No login "; +} +else { +?> +
    +

    Min blogg Nu

    +

    I dag gör vi mallar

    +
    +

    Lorem ipsum id duo autem qualisque, cu laoreet eleifend cum. Eu sea + vidit altera civibus, harum deserunt argumentum ne vim. Eu paulo + corpora appareat pro, brute everti iuvaret ne vis. Diam incorrupte + voluptatibus cu vel, nam congue soluta praesent at. +

    + \ No newline at end of file diff --git a/www/public/M3/06/pages/klotter.php b/www/public/M3/06/pages/klotter.php new file mode 100644 index 0000000..40affd2 --- /dev/null +++ b/www/public/M3/06/pages/klotter.php @@ -0,0 +1,22 @@ +No login "; +} +else { +?> +

    Klotterplanket

    +
    +
    +
    + +
    +
    + +
    + + \ No newline at end of file diff --git a/www/public/M3/06/pages/kontakt.php b/www/public/M3/06/pages/kontakt.php new file mode 100644 index 0000000..7cc4e79 --- /dev/null +++ b/www/public/M3/06/pages/kontakt.php @@ -0,0 +1,11 @@ +No login "; +} +else { +?> +

    My contacts

    +

    First contact

    +

    2nd contact

    +

    3rd contact

    + \ No newline at end of file diff --git a/www/public/M3/06/pages/start.php b/www/public/M3/06/pages/start.php new file mode 100644 index 0000000..fe365ac --- /dev/null +++ b/www/public/M3/06/pages/start.php @@ -0,0 +1,10 @@ +No login "; +} +else { +?> +

    Välkommen till Webbserverprogrammering 1

    +

    Moment 2

    +

    Vi kommer använda include() för att länka in sidor i vår mall.

    + \ No newline at end of file diff --git a/www/public/M3/06/saveMsg.php b/www/public/M3/06/saveMsg.php new file mode 100644 index 0000000..eae70fc --- /dev/null +++ b/www/public/M3/06/saveMsg.php @@ -0,0 +1,8 @@ +

    Från: " . $_POST['name'] . "

    "; + $msg = "

    " . $_POST['message'] . "

    "; + + file_put_contents("../../../M3-06-messages.dat",$name.$msg,FILE_APPEND); + + header("location: index.php?page=klotter"); //Omdirigerar till klotterplanket +?> \ No newline at end of file diff --git a/www/public/M3/06/userManipulation.php b/www/public/M3/06/userManipulation.php new file mode 100644 index 0000000..d7a352b --- /dev/null +++ b/www/public/M3/06/userManipulation.php @@ -0,0 +1,47 @@ + + + + + + Person write + + + + + getUsername() == $user->getUsername() && $userToFind->getPassword() == $user->getPassword()) return true; + } + return false; + } + ?> + + + \ No newline at end of file