Skip to content

Commit

Permalink
Merge pull request #116 from Sweil/alix6_neu
Browse files Browse the repository at this point in the history 
Alix6 neu
  • Loading branch information
@mrgrain
mrgrain committed Jun 20, 2014
2 parents ba6b561 + f944113 commit b582487
Show file tree
Hide file tree
Showing 108 changed files with 1,723 additions and 954 deletions.
9 changes: 5 additions & 4 deletions README
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
Development branches:

- alix6_neu: This is the most recent branch for the next release alix6. Use this a base of your active development.
- master: This will always be the branch of the latest release. After a new release the
specific branch will be merged into this one.
- alix6-bugfixes: This is the branch with bug-fixes for alix6. Use this a base of your development for alix6.
- alix6_neu: This is the base branch of alix6. bugfixes will be merged into it, if occur.
- master: This will always be the branch of the latest release. After a new release the
specific branch will be merged into this one.

Test branches:

- future: This branch is for testing purposes only. I use it to test some long-distance changes.
- future: This branch is for testing purposes only. I use it to test some long-distance changes.
53 changes: 30 additions & 23 deletions db.sql
View file

Large diffs are not rendered by default.

14 changes: 8 additions & 6 deletions www/.htaccess
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
ErrorDocument 403 http://localhost/fs2/www/403.html
ErrorDocument 404 http://localhost/fs2/www/404.html

# Aktiviere RewriteEngine (noetig für alle Rewrites)
RewriteEngine On
<IfModule mod_rewrite.c>
# Aktiviere RewriteEngine
RewriteEngine On

# SEO-URLs
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.+)\.html$ index.php?seoq=$1 [L,QSA]
# SEO-URLs
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.+)\.html$ index.php?seoq=$1 [L,QSA]
</IfModule>
6 changes: 3 additions & 3 deletions www/admin/admin_allannouncement.php
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php if (!defined('ACP_GO')) die('Unauthorized access!');

/////////////////////////////////
//// Datenbank aktualisieren ////
/////////////////////////////////
/////////////////////////
//// Database update ////
/////////////////////////

if ( isset ( $_POST['sended'] ) )
{
Expand Down
6 changes: 3 additions & 3 deletions www/admin/admin_allemail.php
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php if (!defined('ACP_GO')) die('Unauthorized access!');

/////////////////////////////////
//// Datenbank aktualisieren ////
/////////////////////////////////
/////////////////////////
//// Database update ////
/////////////////////////

if ( ( isset($_POST['signup']) && $_POST['signup'] != '' )
&& ( isset($_POST['change_password']) && $_POST['change_password'] != '' )
Expand Down
18 changes: 17 additions & 1 deletion www/admin/admin_allphpinfo.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,23 @@
'.$FD->text('page', 'phpinfo_phpuser').':
</td>
<td class="configthin" colspan="3">
'.exec('whoami').'
';
//Do the required POSIX functions to get the current user's name exist?
// They usually do on Linux but not on Windows systems.
if (function_exists('posix_getuid') && function_exists('posix_getpwuid'))
{
$user_info = posix_getpwuid(posix_getuid());
echo htmlspecialchars($user_info['name']);
}
else
{
/* No POSIX functions available, boo! Falling back to get_current_user,
although that can (and often will) give incorrect result, but that's
the best guess so far. If that bugs you, run your server on a POSIX-
compatible system or enable PHP's POSIX extension. */
echo htmlspecialchars(get_current_user());
}
echo '
</td>
</tr>
<tr><td class="space"></td></tr>
Expand Down
8 changes: 4 additions & 4 deletions www/admin/admin_applets_edit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,10 @@
';
}

//////////////////////////////////////////////////////////////
//// Show to much selected Error & Go back to Select Form ////
//////////////////////////////////////////////////////////////
elseif ( $_POST['applet_action'] == "edit" && count ( $_POST['applet_id'] ) > 1 ) {
///////////////////////////////////////////////////////////////
//// Show too much selected Error & Go back to Select Form ////
///////////////////////////////////////////////////////////////
elseif ( $_POST['applet_action'] == 'edit' && count ( $_POST['applet_id'] ) > 1 ) {
// Display Error
systext ( $FD->text("admin", "select_only_one_to_edit"),
$FD->text("admin", "error"), TRUE, $FD->text("admin", "icon_error") );
Expand Down
10 changes: 5 additions & 5 deletions www/admin/admin_articles_add.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
<td class="config">
<select name="article_cat_id">
';
// Kategorien auflisten
// List categories
$index = $FD->sql()->conn()->query ( 'SELECT * FROM '.$FD->config('pref').'articles_cat' );
while ( $cat_arr = $index->fetch(PDO::FETCH_ASSOC) )
{
Expand Down Expand Up @@ -280,13 +280,13 @@
}


/////////////////////////////////////
//// Artikel in die DB schreiben ////
/////////////////////////////////////
//////////////////////////////
//// Save article into DB ////
//////////////////////////////

if (isset($_POST['url']) && isset($_POST['title']) && isset($_POST['text']) && isset($_POST['cat_id']))
{
if ($_POST['tag'] && $_POST['monat'] && $_POST['jahr']) // Datum überprüfen
if (isset($_POST['tag']) && isset($_POST['monat']) && isset($_POST['jahr'])) // check date
{
$date = mktime(0, 0, 0, $_POST['monat'], $_POST['tag'], $_POST['jahr']);
}
Expand Down
150 changes: 75 additions & 75 deletions www/admin/admin_articles_cat.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,35 +170,35 @@
if ( $_POST['cat_action'] == 'edit' )
{

// Load Data from DB
$index = $FD->sql()->conn()->query ( 'SELECT * FROM '.$FD->config('pref')."articles_cat WHERE cat_id = '".$_POST['cat_id']."'" );
$cat_arr = $index->fetch(PDO::FETCH_ASSOC);
// Load Data from DB
$index = $FD->sql()->conn()->query ( 'SELECT * FROM '.$FD->config('pref')."articles_cat WHERE cat_id = '".$_POST['cat_id']."'" );
$cat_arr = $index->fetch(PDO::FETCH_ASSOC);

// Display Error Messages
if ( isset ( $_POST['sended'] ) ) {
// Display Error Messages
if ( isset ( $_POST['sended'] ) ) {
$cat_arr = getfrompost ( $cat_arr );
systext ( $FD->text("admin", "form_not_filled"), $FD->text("admin", "error"), TRUE );
}
}

// Security-Functions
$cat_arr['cat_name'] = killhtml ( $cat_arr['cat_name'] );
$cat_arr['cat_description'] = killhtml ( $cat_arr['cat_description'] );
// Security-Functions
$cat_arr['cat_name'] = killhtml ( $cat_arr['cat_name'] );
$cat_arr['cat_description'] = killhtml ( $cat_arr['cat_description'] );

// Get User
$index = $FD->sql()->conn()->query ( 'SELECT user_name FROM '.$FD->config('pref')."user WHERE user_id = '".$cat_arr['cat_user']."'" );
$cat_arr['cat_username'] = killhtml ( $index->fetchColumn() );

// Create Date-Arrays
// Create Date-Arrays
if ( !isset ( $_POST['d'] ) ) {
$_POST['d'] = date ( 'd', $cat_arr['cat_date'] );
$_POST['m'] = date ( 'm', $cat_arr['cat_date'] );
$_POST['y'] = date ( 'Y', $cat_arr['cat_date'] );
}
$_POST['d'] = date ( 'd', $cat_arr['cat_date'] );
$_POST['m'] = date ( 'm', $cat_arr['cat_date'] );
$_POST['y'] = date ( 'Y', $cat_arr['cat_date'] );
}
$date_arr = getsavedate ( $_POST['d'], $_POST['m'], $_POST['y'] );
$nowbutton_array = array( 'd', 'm', 'y' );

// Display Page
echo '
// Display Page
echo '
<form action="" method="post" enctype="multipart/form-data">
<input type="hidden" name="sended" value="edit">
<input type="hidden" name="cat_action" value="'.$_POST['cat_action'].'">
Expand Down Expand Up @@ -246,8 +246,8 @@
<td class="config">
'.$FD->text("page", "edit_cat_image").': <span class="small">('.$FD->text("admin", "optional").')</span><br><br>
';
if ( image_exists ( 'images/cat/', 'articles_'.$cat_arr['cat_id'] ) ) {
echo '
if ( image_exists ( 'images/cat/', 'articles_'.$cat_arr['cat_id'] ) ) {
echo '
<img src="'.image_url ( 'images/cat/', 'articles_'.$cat_arr['cat_id'] ).'" alt="'.$cat_arr['cat_name'].'" border="0">
<table>
<tr>
Expand All @@ -260,18 +260,18 @@
</tr>
</table>
';
} else {
echo '<span class="small">'.$FD->text("admin", "no_image_found").'</span><br>';
}
echo' <br>
} else {
echo '<span class="small">'.$FD->text("admin", "no_image_found").'</span><br>';
}
echo ' <br>
</td>
<td class="config">
<input name="cat_pic" type="file" size="40" class="text"><br>
';
if ( image_exists ( 'images/cat/', 'articles_'.$cat_arr['cat_id'] ) ) {
echo '<span class="small"><b>'.$FD->text("admin", "replace_img").'</b></span><br>';
}
echo'
if ( image_exists ( 'images/cat/', 'articles_'.$cat_arr['cat_id'] ) ) {
echo '<span class="small"><b>'.$FD->text("admin", "replace_img").'</b></span><br>';
}
echo'
<span class="small">
['.$FD->text("admin", "max").' '.$articles_config_arr['cat_pic_x'].' '.$FD->text("admin", "resolution_x").' '.$articles_config_arr['cat_pic_y'].' '.$FD->text("admin", "pixel").'] ['.$FD->text("admin", "max").' '.$articles_config_arr['cat_pic_size'].' '.$FD->text("admin", "kib").']
</span>
Expand All @@ -296,22 +296,22 @@
</tr>
</table>
</form>';
}
}

// Delete Category
elseif ( $_POST['cat_action'] == 'delete' )
{
$index = $FD->sql()->conn()->query ( 'SELECT COUNT(*) FROM '.$FD->config('pref').'articles_cat' );
// Delete Category
elseif ( $_POST['cat_action'] == 'delete' )
{
$index = $FD->sql()->conn()->query ( 'SELECT COUNT(*) FROM '.$FD->config('pref').'articles_cat' );

// Not Last Category
if ( $index->fetchColumn() > 1 ) {
// Not Last Category
if ( $index->fetchColumn() > 1 ) {

$index = $FD->sql()->conn()->query ( 'SELECT * FROM '.$FD->config('pref')."articles_cat WHERE cat_id = '".$_POST['cat_id']."'" );
$cat_arr = $index->fetch(PDO::FETCH_ASSOC);
$index = $FD->sql()->conn()->query ( 'SELECT * FROM '.$FD->config('pref')."articles_cat WHERE cat_id = '".$_POST['cat_id']."'" );
$cat_arr = $index->fetch(PDO::FETCH_ASSOC);

$cat_arr['cat_name'] = killhtml ( $cat_arr['cat_name'] );
$cat_arr['cat_name'] = killhtml ( $cat_arr['cat_name'] );

echo '
echo '
<form action="" method="post">
<input type="hidden" name="sended" value="delete">
<input type="hidden" name="cat_action" value="'.$_POST['cat_action'].'">
Expand All @@ -333,13 +333,13 @@
</td>
<td style="text-align: right;">
<select class="text" name="cat_move_to" size="1">
';
';

$index = $FD->sql()->conn()->query ( 'SELECT * FROM '.$FD->config('pref')."articles_cat WHERE cat_id != '".$cat_arr['cat_id']."' ORDER BY cat_name" );
while ( $move_arr = $index->fetch(PDO::FETCH_ASSOC) ) {
echo '<option value="'.$move_arr['cat_id'].'">'.killhtml ( $move_arr['cat_name'] ).'</option>';
}
echo'
$index = $FD->sql()->conn()->query ( 'SELECT * FROM '.$FD->config('pref')."articles_cat WHERE cat_id != '".$cat_arr['cat_id']."' ORDER BY cat_name" );
while ( $move_arr = $index->fetch(PDO::FETCH_ASSOC) ) {
echo '<option value="'.$move_arr['cat_id'].'">'.killhtml ( $move_arr['cat_name'] ).'</option>';
}
echo'
</select>
</td>
</tr>
Expand All @@ -353,22 +353,22 @@
</tr>
</table>
</form>
';
}
';
}

// Last Category
else {
systext ( $FD->text("page", "delete_cat_last"), $FD->text("admin", "error"), TRUE );
echo '
// Last Category
else {
systext ( $FD->text("page", "delete_cat_last"), $FD->text("admin", "error"), TRUE );
echo '
<table class="configtable" cellpadding="4" cellspacing="0">
<tr>
<td class="config">
<a class="link_button" href="?go=articles_cat">'.$FD->text("admin", "button_arrow").' '.$FD->text("page", "delete_back_link").'</a>
</td>
</tr>
</table>';
}
}
}
}
}


Expand All @@ -384,13 +384,13 @@
if (!isset($_POST['cat_name']))
$_POST['cat_name'] = '';
$_POST['cat_name'] = killhtml ( $_POST['cat_name'] );
// Display Error Messages
if ( isset ( $_POST['sended'] ) ) {
systext ( $FD->text('admin', 'form_not_filled'), $FD->text('admin', 'error'), TRUE );
}
// Display Error Messages
if ( isset ( $_POST['sended'] ) ) {
systext ( $FD->text('admin', 'form_not_filled'), $FD->text('admin', 'error'), TRUE );
}

// Display Add-Form
echo '
echo '
<form action="" method="post" enctype="multipart/form-data">
<input type="hidden" name="sended" value="add">
<input type="hidden" name="cat_action" value="add">
Expand Down Expand Up @@ -427,37 +427,37 @@
<tr><td class="space"></td></tr>
</table>
</form>
';
';


// Category Listing
echo '
// Category Listing
echo '
<form action="" method="post">
<input type="hidden" name="go" value="articles_cat">
<table class="configtable" cellpadding="4" cellspacing="0">
<tr><td class="line" colspan="3">'.$FD->text('page', 'list_cat_title').'</td></tr>
';
';

// Get Categories from DB
$index = $FD->sql()->conn()->query ( 'SELECT * FROM '.$FD->config('pref').'articles_cat ORDER BY cat_name' );
while ( $cat_arr = $index->fetch(PDO::FETCH_ASSOC) )
{
$index_username = $FD->sql()->conn()->query ( 'SELECT user_name FROM '.$FD->config('pref')."user WHERE user_id = '".$cat_arr['cat_user']."'" );
// Get Categories from DB
$index = $FD->sql()->conn()->query ( 'SELECT * FROM '.$FD->config('pref').'articles_cat ORDER BY cat_name' );
while ( $cat_arr = $index->fetch(PDO::FETCH_ASSOC) )
{
$index_username = $FD->sql()->conn()->query ( 'SELECT user_name FROM '.$FD->config('pref')."user WHERE user_id = '".$cat_arr['cat_user']."'" );
$cat_arr['cat_user'] = $index_username->fetchColumn();

// Display each Category
echo '
// Display each Category
echo '
<tr class="pointer" id="tr_'.$cat_arr['cat_id'].'"
onmouseover="'.color_list_entry ( 'input_'.$cat_arr['cat_id'], '#EEEEEE', '#64DC6A', 'this' ).'"
onmouseout="'.color_list_entry ( 'input_'.$cat_arr['cat_id'], 'transparent', '#49c24f', 'this' ).'"
onclick="'.color_click_entry ( 'input_'.$cat_arr['cat_id'], '#EEEEEE', '#64DC6A', 'this', TRUE ).'"
>
<td class="config">
';
if ( image_exists ( 'images/cat/', 'articles_'.$cat_arr['cat_id'] ) ) {
echo '<img src="'.image_url ( 'images/cat/', 'articles_'.$cat_arr['cat_id'] ).'" alt="'.$cat_arr['cat_name'].'" border="0">';
}
echo '
if ( image_exists ( 'images/cat/', 'articles_'.$cat_arr['cat_id'] ) ) {
echo '<img src="'.image_url ( 'images/cat/', 'articles_'.$cat_arr['cat_id'] ).'" alt="'.$cat_arr['cat_name'].'" border="0">';
}
echo '
</td>
<td class="config" style="width: 100%;">
'.$cat_arr['cat_name'].' <span class="small">('.$FD->text("page", "list_cat_created_by").' <b>'.$cat_arr['cat_user'].'</b> '.$FD->text("page", "list_cat_created_on").' <b>'.date ( $FD->config('date'), $cat_arr['cat_date'] ).'</b>)</span><br>
Expand All @@ -470,10 +470,10 @@
</td>
</tr>
';
}
}

// End of Form & Table incl. Submit-Button
echo '
// End of Form & Table incl. Submit-Button
echo '
<tr><td class="space"></td></tr>
<tr>
<td style="text-align:right;" colspan="3">
Expand All @@ -493,6 +493,6 @@
</tr>
</table>
</form>
';
';
}
?>
Loading

0 comments on commit b582487

Please sign in to comment.