jeena/seinheit.ch
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge branch 'master' of github.com:jeena/seinheit.ch

Browse source
This commit is contained in:
jeena 2013-07-10 14:50:25 +02:00
commit f95b70d17e
11 changed files with 146 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
.DS_Store vendored Normal file
View file

Binary file not shown.

1
.gitignore vendored
View file

@ -2,3 +2,4 @@
config/admin.ini config/admin.ini
config/database.config.ini config/database.config.ini
public/img/header public/img/header
public/img/page

14
application/controller/AdminPageController.php
View file

@ -26,19 +26,22 @@ class AdminPageController extends Katharsis_Controller_Abstract
$type = 'page'; $type = 'page';
} }
$path = getcwd().'/img/' . $type . '/'; $path = getcwd().'/public/img/' . $type . '/';
if(isset($_FILES['myfile'])) if(isset($_FILES['myfile']))
{ {
$upload = new Upload(); $upload = new Upload();
if($type == 'header') { if($type == 'header') {
$upload->header($_FILES['myfile']); $imagePath = $upload->header($_FILES['myfile']);
} else { } else {
$upload->page($_FILES['myfile']); $imagePath = $upload->page($_FILES['myfile']);
} }
echo 'Das Hochladen war erfolgreich.<br><br>'; $this->_view->imagePath = $imagePath;
echo $this->_view->render('AdminPage/uploadsuccess');
die();
} }
@ -51,7 +54,7 @@ class AdminPageController extends Katharsis_Controller_Abstract
} }
$ar = array(); $ar = array();
if (is_readable($path) && $handle = opendir()) if (is_readable($path) && $handle = opendir($path))
{ {
while (false !== ($file = readdir($handle))) { while (false !== ($file = readdir($handle))) {
if(is_dir($file)) continue; if(is_dir($file)) continue;
@ -60,6 +63,7 @@ class AdminPageController extends Katharsis_Controller_Abstract
closedir($handle); closedir($handle);
} }
$this->_view->type = $type;
$this->_view->files = $ar; $this->_view->files = $ar;
echo $this->_view->render('AdminPage/image'); echo $this->_view->render('AdminPage/image');

2
application/controller/PageController.php
View file

@ -18,7 +18,7 @@ class PageController extends Katharsis_Controller_Abstract
$url = substr($method, 0, -6); // remove Action from urlAction $url = substr($method, 0, -6); // remove Action from urlAction
$pageId = $this->_page->getIdByUrl($url); $pageId = $this->_page->getIdByUrl($url, $preview);
if(!$pageId) { if(!$pageId) {
throw new DidgeridooArtwork_Exception('Page konnte nicht geladen werden.'); throw new DidgeridooArtwork_Exception('Page konnte nicht geladen werden.');

48
application/model/Upload.php
View file

@ -8,13 +8,13 @@ class Upload extends Katharsis_Model_Abstract
public function header($file) public function header($file)
{ {
$dir = getcwd() . '/img/header'; $dir = getcwd() . '/public/img/header';
return $this->_uploadFile(null, $file, $dir); return $this->_uploadFile(null, $file, $dir);
} }
public function page($file) public function page($file)
{ {
$dir = getcwd() . '/img/page'; $dir = getcwd() . '/public/img/page';
return $this->_uploadFile(null, $file, $dir, $file['name'] . '-' . time()); return $this->_uploadFile(null, $file, $dir, $file['name'] . '-' . time());
} }
@ -22,7 +22,7 @@ class Upload extends Katharsis_Model_Abstract
{ {
if($name === null) if($name === null)
{ {
$name = $id . '-' . time(); $name = time();
} }
else else
{ {
@ -32,24 +32,34 @@ class Upload extends Katharsis_Model_Abstract
} }
} }
$handle = new Verot_Upload($file); if (!is_dir($dir)) {
return; mkdir($dir);
$handle->file_new_name_body = $name; }
if ($handle->uploaded) $typeAccepted = array("image/jpeg", "image/gif", "image/png");
if(!in_array($file['type'], $typeAccepted)) {
throw new DidgeridooArtwork_Exception('Hochladen fehlgeschlagen. Dateityp nicht akzeptiert. Nur jpeg, gif und png möglich');
return false;
}
$ext = '';
switch($file['type']) {
case "image/jpeg":
$ext = '.jpg';
break;
case "image/gif":
$ext = '.gif';
break;
case "image/png":
$ext = '.png';
break;
}
if (!move_uploaded_file($file['tmp_name'], $dir . '/' . $name . $ext))
{ {
$handle->Process($dir); throw new DidgeridooArtwork_Exception('Hochladen fehlgeschlagen. (move_uploaded_file: false)');
if (!$handle->processed) return false;
{
throw new DidgeridooArtwork_Exception('Datei konnte nicht verschoben werden (' . $handle->error . ').');
} }
$handle->Clean(); return $name . $ext;
}
else
{
throw new DidgeridooArtwork_Exception('Datei konnte nicht hochgeladen werden (' . $handle->error . ').');
}
$returnName = $handle->file_dst_name;
return $returnName;
} }
} }

7
application/view/AdminPage/image.phtml
View file

@ -1,9 +1,8 @@
<html> <html>
<head> <head>
<title>Swiss Didgeridoo Artwork</title> <title>Seinheit</title>
<link rel="stylesheet" type="text/css" href="/style/main.css" /> <link rel="stylesheet" type="text/css" href="/style/main.css" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="Description" content="Swiss Didgeridoo Artwork - Online Shop" />
</head> </head>
<body> <body>
@ -18,8 +17,8 @@
<ul style="padding-left: 16px; list-style-type: none"> <ul style="padding-left: 16px; list-style-type: none">
<?php foreach($this->files as $file): ?> <?php foreach($this->files as $file): ?>
<li> <li>
<a href="javascript: void(0);" onclick="window.open('/img/page/<?php echo $file; ?>', 'Bild', 'width=400,height=300,status=yes,scrollbars=yes,resizable=yes');"><img src="/img/page/<?php echo $file; ?>" width="50" height="50" /></a> <a href="javascript: void(0);" onclick="window.open('/img/page/<?php echo $file; ?>', 'Bild', 'width=400,height=300,status=yes,scrollbars=yes,resizable=yes');"><img src="/img/<?php echo $this->type; ?>/<?php echo $file; ?>" width="50" height="50" /></a>
<a href="javascript: void(0);" onclick="opener.document.getElementById('src').value='/img/page/<?php echo $file; ?>'; window.close();" >Einf&uuml;gen</a> <a href="javascript: void(0);" onclick="opener.document.getElementById('src').value='/img/<?php echo $this->type; ?>/<?php echo $file; ?>'; window.close();" >Einf&uuml;gen</a>
<a href="?delete=<?php echo $file ?>" style="float:right; margin-top: 35px">L&ouml;schen</a> <a href="?delete=<?php echo $file ?>" style="float:right; margin-top: 35px">L&ouml;schen</a>
</li> </li>

10
application/view/AdminPage/uploadsuccess.phtml Normal file
View file

@ -0,0 +1,10 @@
<h2>Das Hochladen war erfolgreich.</h2>
<script type="text/javascript">
opener.document.forms[0].header_image.value = '<?php echo $this->imagePath;?>';
setTimeout(function() {
window.self.close();
}, 800);
</script>

2
library/DidgeridooArtwork/Controller/Plugin/Navigation.php
View file

@ -4,7 +4,7 @@ class DidgeridooArtwork_Controller_Plugin_Navigation extends Katharsis_Controlle
public function preController() public function preController()
{ {
$view = Katharsis_View::getInstance(); $view = Katharsis_View::getInstance();
$sql = "SELECT id, name, controller, action, link FROM navigation WHERE parent_id IS NULL ORDER BY sorting"; $sql = "SELECT id, name, controller, action, link FROM navigation WHERE parent_id IS NULL AND active = 1 ORDER BY sorting";
$view->mainNavigationItems = $this->_con->fetchAll($sql); $view->mainNavigationItems = $this->_con->fetchAll($sql);
$sql = "SELECT id, parent_id, controller, action FROM navigation WHERE (action = :action AND controller = :controller) OR (action IS NULL AND controller = :controller)"; $sql = "SELECT id, parent_id, controller, action FROM navigation WHERE (action = :action AND controller = :controller) OR (action IS NULL AND controller = :controller)";

1
library/Katharsis/Controller/Plugin/Autorender.php
View file

@ -17,4 +17,3 @@ class Katharsis_Controller_Plugin_Autorender extends Katharsis_Controller_Plugin
echo $view->render('main'); echo $view->render('main');
} }
} }
?>

1
library/Katharsis/View.php
View file

@ -70,4 +70,3 @@ class Katharsis_View
return $date[2] . '.' . $date[1] . '.' . $date[0]; return $date[2] . '.' . $date[1] . '.' . $date[0];
} }
} }
?>

2
public/index.php
View file

@ -12,7 +12,6 @@ chdir('..');
require_once('library/Katharsis/Bootstrap.php'); require_once('library/Katharsis/Bootstrap.php');
Katharsis_Autoload::init(); Katharsis_Autoload::init();
Katharsis_Controller_Plugin::registerPlugin(new DidgeridooArtwork_Controller_Plugin_SetNames()); Katharsis_Controller_Plugin::registerPlugin(new DidgeridooArtwork_Controller_Plugin_SetNames());
Katharsis_Controller_Plugin::registerPlugin(new Katharsis_Controller_Plugin_StartSession()); Katharsis_Controller_Plugin::registerPlugin(new Katharsis_Controller_Plugin_StartSession());
Katharsis_Controller_Plugin::registerPlugin(new DidgeridooArtwork_Controller_Plugin_Notice()); Katharsis_Controller_Plugin::registerPlugin(new DidgeridooArtwork_Controller_Plugin_Notice());
@ -22,7 +21,6 @@ Katharsis_Controller_Plugin::registerPlugin(new Katharsis_Controller_Plugin_Auto
Katharsis_Controller_Plugin::registerPlugin(new DidgeridooArtwork_Controller_Plugin_Access()); Katharsis_Controller_Plugin::registerPlugin(new DidgeridooArtwork_Controller_Plugin_Access());
Katharsis_Controller_Plugin::registerPlugin(new DidgeridooArtwork_Controller_Plugin_Navigation()); Katharsis_Controller_Plugin::registerPlugin(new DidgeridooArtwork_Controller_Plugin_Navigation());
try { try {
Katharsis_Bootstrap::init(); Katharsis_Bootstrap::init();
Katharsis_Bootstrap::run(); Katharsis_Bootstrap::run();