Skip to content

Commit

Permalink
Poprawki zgłoszonych ostatnio błędów
Browse files Browse the repository at this point in the history
  • Loading branch information
Inscure committed Oct 12, 2012
1 parent 16f02ad commit 3ab3d5b
Show file tree
Hide file tree
Showing 1,725 changed files with 345,830 additions and 345,784 deletions.
22 changes: 11 additions & 11 deletions LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Copyright � 2004-2012 eXtreme-Fusion Team. All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
Copyright � 2004-2012 eXtreme-Fusion Team. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
242 changes: 121 additions & 121 deletions admin/index.php
View file
Original file line number Diff line number Diff line change
@@ -1,122 +1,122 @@
<?php
/***********************************************************
| eXtreme-Fusion 5.0 Beta 5
| Content Management System
|
| Copyright (c) 2005-2012 eXtreme-Fusion Crew
| http://extreme-fusion.org/
|
| This product is licensed under the BSD License.
| http://extreme-fusion.org/ef5/license/
***********************************************************/
try
{
require_once '../config.php';
require DIR_SITE.'bootstrap.php';
require_once DIR_SYSTEM.'admincore.php';

$tpl = new AdminMainEngine;

$tpl->assign('Action', $_request->get('action')->show());

if ($_request->session(array('history', 'Page'))->show())
{
$tpl->assign('History', $_SESSION['history']);
}

if ($_request->get('action')->show() === 'login')
{
if ($_request->post('login')->show())
{
if ($_user->adminLogin($_request->post('user')->show(), $_request->post('pass')->show()))
{
$_request->redirect(ADDR_ADMIN);
}
}
}
elseif ($_request->get('action')->show() === 'logout')
{
$_user->adminLogout();
$_request->redirect(ADDR_ADMIN);
}
else
{
if ( ! $_user->hasPermission('admin.login'))
{//echo 8; exit;
$_user->adminLogout();
$_request->redirect(ADDR_ADMIN.'index.php', array('action' => 'login'));
}
else
{
$query = $_pdo->query('SELECT page, permissions FROM [admin]');
if ($query)
{
foreach($query as $data)
{
if ($_user->hasPermission($data['permissions']))
{
if ( ! isset($page_links[$data['page']]))
{
$page_links[$data['page']] = 1;
}
else
{
$page_links[$data['page']]++;
}
}
}

/*
Póki co moduł prywatnych wiadomości nie jest stworzony.
Więc bez sesnu pobierać te dane...
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
$GetMessages = $_pdo->getMatchRowsCount('SELECT `id` FROM [messages] WHERE `to` = :to AND `read`=0 AND `folder`=0', array(
array(':to', $_user->get('id'), PDO::PARAM_INT)
));
$tpl->assign('Messages', $GetMessages);
*/

$tpl->assign('UserID', $_user->get('id'));

if (isset($page_links))
{
for ($i = 1, $c = count($page_links); $i <= $c; $i++)
{
if (isset($page_links[$i]))
{
$DefaultPageNum = $i;
break;
}
}
$tpl->assign('Count', $page_links);
$tpl->assign('DefaultPageNum', $DefaultPageNum);
}
else
{
HELP::redirect(ADDR_ADMIN.'index.php?action=login');
}
}
else
{
HELP::redirect(ADDR_ADMIN.'index.php?action=login');
}
}
}

$tpl->template('pre'.DS.'_framework');
}
catch(optException $exception)
{
optErrorHandler($exception);
}
catch(systemException $exception)
{
systemErrorHandler($exception);
}
catch(userException $exception)
{
userErrorHandler($exception);
<?php
/***********************************************************
| eXtreme-Fusion 5.0 Beta 5
| Content Management System
|
| Copyright (c) 2005-2012 eXtreme-Fusion Crew
| http://extreme-fusion.org/
|
| This product is licensed under the BSD License.
| http://extreme-fusion.org/ef5/license/
***********************************************************/
try
{
require_once '../config.php';
require DIR_SITE.'bootstrap.php';
require_once DIR_SYSTEM.'admincore.php';

$tpl = new AdminMainEngine;

$tpl->assign('Action', $_request->get('action')->show());

if ($_request->session(array('history', 'Page'))->show())
{
$tpl->assign('History', $_SESSION['history']);
}

if ($_request->get('action')->show() === 'login')
{
if ($_request->post('login')->show())
{
if ($_user->adminLogin($_request->post('user')->show(), $_request->post('pass')->show()))
{
$_request->redirect(ADDR_ADMIN);
}
}
}
elseif ($_request->get('action')->show() === 'logout')
{
$_user->adminLogout();
$_request->redirect(ADDR_ADMIN);
}
else
{
if ( ! $_user->hasPermission('admin.login'))
{//echo 8; exit;
$_user->adminLogout();
$_request->redirect(ADDR_ADMIN.'index.php', array('action' => 'login'));
}
else
{
$query = $_pdo->query('SELECT page, permissions FROM [admin]');
if ($query)
{
foreach($query as $data)
{
if ($_user->hasPermission($data['permissions']))
{
if ( ! isset($page_links[$data['page']]))
{
$page_links[$data['page']] = 1;
}
else
{
$page_links[$data['page']]++;
}
}
}

/*
Póki co moduł prywatnych wiadomości nie jest stworzony.
Więc bez sesnu pobierać te dane...
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
$GetMessages = $_pdo->getMatchRowsCount('SELECT `id` FROM [messages] WHERE `to` = :to AND `read`=0 AND `folder`=0', array(
array(':to', $_user->get('id'), PDO::PARAM_INT)
));
$tpl->assign('Messages', $GetMessages);
*/

$tpl->assign('UserID', $_user->get('id'));

if (isset($page_links))
{
for ($i = 1, $c = count($page_links); $i <= $c; $i++)
{
if (isset($page_links[$i]))
{
$DefaultPageNum = $i;
break;
}
}
$tpl->assign('Count', $page_links);
$tpl->assign('DefaultPageNum', $DefaultPageNum);
}
else
{
HELP::redirect(ADDR_ADMIN.'index.php?action=login');
}
}
else
{
HELP::redirect(ADDR_ADMIN.'index.php?action=login');
}
}
}

$tpl->template('pre'.DS.'_framework');
}
catch(optException $exception)
{
optErrorHandler($exception);
}
catch(systemException $exception)
{
systemErrorHandler($exception);
}
catch(userException $exception)
{
userErrorHandler($exception);
}
82 changes: 41 additions & 41 deletions admin/pages/ajax/date.php
View file
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
<?php
/***********************************************************
| eXtreme-Fusion 5.0 Beta 5
| Content Management System
|
| Copyright (c) 2005-2012 eXtreme-Fusion Crew
| http://extreme-fusion.org/
|
| This product is licensed under the BSD License.
| http://extreme-fusion.org/ef5/license/
***********************************************************/
try
{
require_once '../../../config.php';
require DIR_SITE.'bootstrap.php';
require_once DIR_SYSTEM.'admincore.php';

if ($_user->isLoggedIn())
{
if ($_request->post('value')->show())
{
$strf_time = time()+($_sett->get('offset_timezone')*3600);
echo @HELP::strfTimeToUTF($_request->post('value')->show(), $strf_time);
}
}
}
catch(optException $exception)
{
optErrorHandler($exception);
}
catch(systemException $exception)
{
systemErrorHandler($exception);
}
catch(userException $exception)
{
userErrorHandler($exception);
}
catch(PDOException $exception)
{
PDOErrorHandler($exception);
<?php
/***********************************************************
| eXtreme-Fusion 5.0 Beta 5
| Content Management System
|
| Copyright (c) 2005-2012 eXtreme-Fusion Crew
| http://extreme-fusion.org/
|
| This product is licensed under the BSD License.
| http://extreme-fusion.org/ef5/license/
***********************************************************/
try
{
require_once '../../../config.php';
require DIR_SITE.'bootstrap.php';
require_once DIR_SYSTEM.'admincore.php';

if ($_user->isLoggedIn())
{
if ($_request->post('value')->show())
{
$strf_time = time()+($_sett->get('offset_timezone')*3600);
echo @HELP::strfTimeToUTF($_request->post('value')->show(), $strf_time);
}
}
}
catch(optException $exception)
{
optErrorHandler($exception);
}
catch(systemException $exception)
{
systemErrorHandler($exception);
}
catch(userException $exception)
{
userErrorHandler($exception);
}
catch(PDOException $exception)
{
PDOErrorHandler($exception);
}
Loading

0 comments on commit 3ab3d5b

Please sign in to comment.