From 1359689ca18e1dd8097ad3fc3013689fea9182ee Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Sun, 5 Apr 2015 18:24:07 +0200
Subject: [PATCH] news things

---
 .gitignore                        |  1 +
 _sakura/components/Main.php       |  4 ++--
 _sakura/config/config.example.php | 26 ++++++++++++++++++++++++++
 main/.htaccess                    | 13 ++++++-------
 main/news.php                     |  2 +-
 5 files changed, 36 insertions(+), 10 deletions(-)
 create mode 100644 _sakura/config/config.example.php

diff --git a/.gitignore b/.gitignore
index 0a156ec..d23f169 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@ local.properties
 #################
 
 errors.log
+config.php
 
 
 #################
diff --git a/_sakura/components/Main.php b/_sakura/components/Main.php
index ef86614..6b3cf12 100644
--- a/_sakura/components/Main.php
+++ b/_sakura/components/Main.php
@@ -159,10 +159,10 @@ class Main {
     }
 
     // Getting news posts
-    public static function getNewsPosts($limit = null) {
+    public static function getNewsPosts($limit = null, $pid = false) {
 
         // Get news posts
-        $newsPosts = Database::fetch('news', true, null, ['id', true], ($limit ? [$limit] : null));
+        $newsPosts = Database::fetch('news', true, ($pid ? ['id' => [$limit, '=']] : null), ['id', true], ($limit && !$pid ? [$limit] : null));
 
         // Get user data
         foreach($newsPosts as $newsId => $newsPost) {
diff --git a/_sakura/config/config.example.php b/_sakura/config/config.example.php
new file mode 100644
index 0000000..9a8626f
--- /dev/null
+++ b/_sakura/config/config.example.php
@@ -0,0 +1,26 @@
+<?php
+// Flashii Configuration
+$sakuraConf = array(); // Define configuration array
+
+// PDO Database Connection
+$sakuraConf['db']               = array();
+$sakuraConf['db']['driver']     = 'mysql';
+$sakuraConf['db']['unixsocket'] = false;
+$sakuraConf['db']['host']       = 'localhost';
+$sakuraConf['db']['port']       = 3306;
+$sakuraConf['db']['username']   = 'flashii';
+$sakuraConf['db']['password']   = 'password';
+$sakuraConf['db']['database']   = 'flashii';
+$sakuraConf['db']['prefix']     = 'fii_';
+
+// URLs (for modularity)
+$sakuraConf['urls']['main']     = 'flashii.net';
+$sakuraConf['urls']['api']      = 'api.flashii.net';
+$sakuraConf['urls']['content']  = 'cdn.flashii.net';
+$sakuraConf['urls']['chat']     = 'chat.flashii.net';
+$sakuraConf['urls']['manage']   = 'manage.flashii.net';
+
+// Errata
+$sakuraConf['etc']['localPath']     = '/var/www/flashii.net/';
+$sakuraConf['etc']['templatesPath'] = $sakuraConf['etc']['localPath'] .'_sakura/templates/';
+$sakuraConf['etc']['design']        = 'yuuno';
diff --git a/main/.htaccess b/main/.htaccess
index 673f4a9..0e5c803 100644
--- a/main/.htaccess
+++ b/main/.htaccess
@@ -15,20 +15,19 @@ Options +FollowSymLinks -Indexes
 
 # Rewrite Rules
 
+# Remove .php from the url
+RewriteEngine on
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond %{REQUEST_FILENAME}\.php -f
+RewriteRule ^(.*)$ $1.php
+
 ## Info pages
 RewriteRule ^r/([a-z]+)$ infopage.php?r=$1
 
 ## News
-RewriteRule ^news?/?$ news.php
 RewriteRule ^news/([0-9]+)$ news.php?id=$1
 RewriteRule ^news.xml$ news.php?xml
 
 # Serving Images
 RewriteRule ^a/([0-9]+)$ imageserve.php?m=avatar&u=$1
 RewriteRule ^a/([0-9]+).png$ imageserve.php?m=avatar&u=$1
-
-# Remove .php from the url
-RewriteEngine on
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteCond %{REQUEST_FILENAME}\.php -f
-RewriteRule ^(.*)$ $1.php
diff --git a/main/news.php b/main/news.php
index 6f19a77..a80821b 100644
--- a/main/news.php
+++ b/main/news.php
@@ -13,7 +13,7 @@ require_once '/var/www/flashii.net/_sakura/sakura.php';
 $renderData['page'] = [
     'title' => 'Flashii News'
 ];
-$renderData['newsPosts'] = Main::getNewsPosts((isset($_GET['id']) && !isset($_GET['xml']) && is_numeric($_GET['id'])) ? $_GET['id'] : null);
+$renderData['newsPosts'] = Main::getNewsPosts((isset($_GET['id']) && !isset($_GET['xml']) && is_numeric($_GET['id'])) ? $_GET['id'] : null, (isset($_GET['id']) && !isset($_GET['xml']) && is_numeric($_GET['id'])));
 
 // News XML, don't really care so yeah
 if(isset($_GET['xml'])) {