Update readme, release 0.14.0

Manual redo of pull request 503.

.dockerignore

@@ -1 +0,0 @@
-.git*

Dockerfile

@@ -1,23 +0,0 @@
-FROM php:7.1-apache
-
-EXPOSE 80
-
-# Note that 'vim' and 'mysql-client' are changed to an echo,
-# as they're only useful when debugging, and leaving them in
-# the standard container only increases its size.
-RUN apt-get -y update && \
-	apt-get -y install libpng-dev zlib1g-dev cron && \
-	echo apt-get -y install vim mysql-client && \
-	a2enmod rewrite && \
-	docker-php-ext-install mysqli gd && \
-	rm -rf /var/lib/apt/lists/*
-
-COPY htdocs /var/www/html
-COPY htdocs/application/config/stikked.php.dist /var/www/html/application/config/stikked.php
-
-# This overwrites the entrypoint from the php container with ours, which updates the
-# stikked config file based on environment variables
-COPY docker/docker-php-entrypoint /usr/local/bin/
-
-RUN chmod +x /usr/local/bin/docker-php-entrypoint
-

README.md

@@ -41,7 +41,7 @@ Prerequisites
 Installation
 ------------
 
-1. Download stikked from https://github.com/claudehohl/Stikked/tags
+1. Download Stikked from https://github.com/claudehohl/Stikked/releases
 2. Create a user and database for Stikked
 3. Copy application/config/stikked.php.dist to application/config/stikked.php
 4. Edit configuration settings in application/config/stikked.php - everything is described there
@@ -58,12 +58,11 @@ Installation
 How to run it in Docker
 -----------------------
 
-    sudo docker build -t stikked .
+    docker-compose up
-    sudo docker-compose up -d
 
-This automatically creates a database with passwords that are configurable in the docker-compose.yml file.
+This automatically builds the docker-image and fires up nginx, php and mariadb. Access your Stikked instance at http://localhost/.
 
-NOTE: This sets the captcha to false and requires port 80 to be accessible on the host machine. Also, a host entry of 127.0.0.1 stikked.local will fix the base_url issues.
+All files are served directly; the Stikked-configuration for Docker resides in docker/stikked.php
 
 
 Documentation
@@ -81,6 +80,21 @@ In the folder doc/, you will find:
 Changelog
 ---------
 
+### Version 0.14.0:
+
+* Rewritten the Docker setup to be simple and clean:
+  * switch to nginx-alpine, php-fpm-alpine and mariadb
+  * docker-compose: autobuild php-image for stikked
+  * serve all files directly (htdocs is mounted instead of copied)
+  * stikked-configuration for docker resides in docker/stikked.php
+* force private-flag when a previously encrypted paste gets pasted public
+* Fixed a critical bug that allowed pasting despite captcha
+* Various bugfixes and improvements
+
+#### Upgrade instructions
+
+Copy your htdocs/application/stikked.php config file away. Upload the new version. Copy it back.
+
 ### Version 0.13.0:
 
 * Updated CodeIgniter to 3.1.9

doc/CREATING_THEMES.md

@@ -8,6 +8,8 @@ How to create your own theme
 For example: If you've only modified the main.css, create a folder named "css" in your theme folder, and put your main.css in there.
 The theme engine will load your css, and falls back to files in the default theme that aren't in your theme folder.
 
+Note: Image files need to reside in the /images folder and it can't contain sub-directories.
+
 Examples:
 
 * gabdark - a theme with only a modified main.css

doc/DEVELOPMENT.md

@@ -2,9 +2,5 @@ You want to improve Stikked? Always welcome! Send us your pull request and you w
 
 Some guidelines:
 
-* For PHP only files (not views/themes), please run the PHP Beautifier (http://pear.php.net/package/PHP_Beautifier) with the following parameters:
+* Coding style: PSR-2. For PHP files (not views/themes), please run phpfmt (https://marketplace.visualstudio.com/items?itemName=kokororin.vscode-phpfmt).
-```
-php_beautifier --indent_tabs -l "IndentStyles(style=bsd) ArrayNested() NewLines(before=function:T_CLASS:if,after=T_COMMENT) ListClassFunction()"
-```
-* Optionally, use https://phpbeautifier.com/ with "Allman style" formatting for smaller segments of PHP-only code
 * Other people may modify your contribution. Don't take that personal; we all want to improve Stikked. Your input is always welcome!

docker-compose.yml

@@ -1,29 +1,31 @@
-version: "3.2"
+version: "3.7"
 
 services:
-  db:
+  nginx:
-    image: mysql:latest
+    image: nginx:1.17-alpine
     volumes:
-      - db_data:/var/lib/mysql
+      - ./docker/nginx.conf:/etc/nginx/conf.d/default.conf:ro
-    env_file: docker/stikked-envvars.txt
+      - ./htdocs:/htdocs:ro
-
-  stikked:
-    depends_on:
-      - db
-    image: stikked
-    env_file: docker/stikked-envvars.txt
     ports:
-      - 80:80
+      - 127.0.0.1:80:80/tcp
 
-# You should use persistant storage for this,
+  php:
-# as if the volume is deleted, everything is gone!
+    image: stikked-php:1
     volumes:
-  db_data:
+      - ./docker/php.ini:/usr/local/etc/php/php.ini:ro
-
+      - ./docker/php-fpm.conf:/usr/local/etc/php-fpm.d/www.conf:ro
-# Example of NFS backed persistant storage:
+      - ./htdocs:/htdocs
-#  db_data:
+      - ./docker/stikked.php:/htdocs/application/config/stikked.php:ro
-#    driver_opts:
+    build:
-#      type: "nfs"
+      context: ./docker/php
-#        o: "addr=192.168.1.254,nolock,soft,rw"
-#        device: ":/nfs/export/pbdatabase"
 
+  mysql:
+    image: mariadb:10.4
+    command: mysqld --innodb-buffer-pool-size=4000000000
+    volumes:
+      - ./mysql-datadir_customize-in-docker-compose.yml:/var/lib/mysql
+    environment:
+      MYSQL_ROOT_PASSWORD: root
+      MYSQL_DATABASE: stikked
+      MYSQL_USER: stikked
+      MYSQL_PASSWORD: stikked

docker/docker-php-entrypoint

@@ -1,70 +0,0 @@
-#!/bin/bash
-
-# This is copied from the original docker-php-entrypoint and was updated
-# by the Stikked container
-
-set -e
-
-# Check to see where Stikked might be - If you added Stikked to this
-# container with something like:
-# ADD https://github.com/claudehohl/Stikked/archive/0.12.0.tar.gz /usr/local
-# then it will be in /usr/local/stikked/Stikked-0.12.0/htdocs/application/config/stikked.php.dist
-
-# If you're using the standard Dockerfile from Stikked, it will be in
-# /var/www/html/htdocs/applcation/config/stikked.php.dist
-
-if [ -e /var/www/html/application/config/stikked.php.dist ]; then
-	CFG=/var/www/html/application/config/stikked.php
-	cp /var/www/html/application/config/stikked.php.dist $CFG
-elif [ -e /usr/local/stikked/Stikked-*/htdocs/application/config/stikked.php.dist ]; then
-	CFG=$(echo /usr/local/stikked/Stikked-*/htdocs/application/config/stikked.php.dist | sed 's/\.dist//')
-	cp /usr/local/stikked/Stikked-*/htdocs/application/config/stikked.php.dist $CFG
-else
-	echo I can not find the stikked.php.dist file, which means docker-php-entrypoint
-	echo needs to be updated. Sorry. I can not continue. Exiting.
-	exit -1
-fi
-
-# Set some default variables
-STIKKED_SITE_NAME="${STIKKED_SITE_NAME:-Dockerised Stikked Container}"
-STIKKED_BASE_URL="${STIKKED_BASE_URL:-https://bogus.example.com/}"
-STIKKED_DB_HOSTNAME="${STIKKED_DB_HOSTNAME:-db}"
-
-# If these aren't set, use MYSQL_ values. If they're not set, then
-# just guess.
-STIKKED_DB_DATABASE="${STIKKED_DB_DATABASE:-${MYSQL_DATABASE:-stikked}}"
-STIKKED_DB_USERNAME="${STIKKED_DB_USERNAME:-${MYSQL_USER:-stikked}}"
-STIKKED_DB_PASSWORD="${STIKKED_DB_PASSWORD:-${MYSQL_PASSWORD:-stikked}}"
-
-# If there's not a cron key, set a random one.
-if [ ! "$STIKKED_CRON_KEY" ]; then
-	# Note - this is not very random. But it'll do in a pinch.
-	STIKKED_CRON_KEY=$RANDOM.$RANDOM.$RANDOM.$RANDOM
-fi
-
-# Put the cron file in place
-echo "*/5 * * * * root curl --silent http://localhost/cron/$STIKKED_CRON_KEY" > /etc/cron.d/stikked
-
-# This gets all environment variables that start with STIKKED_
-svars=$(set | grep \^STIKKED_ | cut -d= -f1)
-for svar in $svars; do
-	# Remove STIKKED_ from the front, and convert it to lower
-	# case (STIKKED_CRON_KEY is now cron_key)
-        val=$(echo $svar | sed 's/STIKKED_\(.*\)/\L\1/')
-        # if it has a /, escape it - for example, in a path or URL.
-        FIXED=$(echo ${!svar} | sed 's_/_\\/_g')
-	# Tell the user what's going on
-        echo Setting $val to be $FIXED
-	# And actually update the file
-        sed -i "s/\['$val'\].*/['$val'] = '$FIXED';/" $CFG
-done
-
-# Start Cron, if it exists
-[ -e /usr/sbin/cron ] && /usr/sbin/cron
-
-# first arg is `-f` or `--some-option`
-if [ "${1#-}" != "$1" ]; then
-        set -- apache2-foreground "$@"
-fi
-
-exec "$@"

docker/nginx.conf

@@ -0,0 +1,69 @@
+upstream php {
+    #server unix:/var/run/php5-fpm.sock;
+    server php:9000;
+}
+
+server {
+    listen 80 backlog=1024;
+
+    server_name localhost;
+    server_tokens off;
+
+    root /htdocs;
+    index index.php;
+
+    client_body_buffer_size 8M;
+    client_max_body_size 8M;
+
+    gzip on;
+    gzip_types text/plain text/css application/javascript;
+
+    # Only requests to our Host are allowed
+    if ($host !~ ^localhost$ ) {
+        return 444;
+    }
+
+    # Only allow these request methods
+    if ($request_method !~ ^(GET|HEAD|POST)$ ) {
+        return 444;
+    }
+
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    # Deny all attempts to access hidden files such as .htaccess, .htpasswd, .DS_Store (Mac).
+    location ~ /\. {
+        deny all;
+    }
+
+    # Deny access to any files with a .php extension in the static directory
+    location ~* /(?:static)/.*\.php$ {
+        deny all;
+    }
+
+    location / {
+        # This is cool because no php is touched for static content.
+        # include the "?$args" part so non-default permalinks doesn't break when using query string
+        try_files $uri $uri/ /index.php?$args;
+    }
+
+    location ~ \.php$ {
+        #NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini
+        include fastcgi.conf;
+        fastcgi_intercept_errors on;
+        fastcgi_pass php;
+    }
+
+    location ~* \.(js|css|png|ico)$ {
+        expires max;
+        log_not_found off;
+    }
+}

docker/php-fpm.conf

@@ -0,0 +1,12 @@
+[www]
+user = www-data
+group = www-data
+listen = /run/php/php7.0-fpm.sock
+listen.owner = www-data
+listen.group = www-data
+pm = dynamic
+pm.max_children = 20
+pm.start_servers = 4
+pm.min_spare_servers = 4
+pm.max_spare_servers = 8
+pm.max_requests = 10000

docker/php.ini

@@ -0,0 +1,65 @@
+[PHP]
+short_open_tag = Off
+precision = 14
+output_buffering = 4096
+zlib.output_compression = Off
+implicit_flush = Off
+serialize_precision = 17
+disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,
+zend.enable_gc = On
+expose_php = Off
+max_execution_time = 30
+max_input_time = 60
+memory_limit = 128M
+error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
+display_errors = Off
+display_startup_errors = Off
+log_errors = On
+log_errors_max_len = 1024
+ignore_repeated_errors = Off
+ignore_repeated_source = Off
+report_memleaks = On
+track_errors = Off
+html_errors = On
+variables_order = "GPCS"
+request_order = "GP"
+register_argc_argv = Off
+auto_globals_jit = On
+post_max_size = 10M
+default_mimetype = "text/html"
+default_charset = "UTF-8"
+enable_dl = Off
+file_uploads = On
+upload_max_filesize = 8M
+max_file_uploads = 20
+allow_url_fopen = On
+allow_url_include = Off
+default_socket_timeout = 60
+
+[MySQLi]
+mysqli.max_persistent = -1
+mysqli.allow_persistent = On
+mysqli.max_links = -1
+mysqli.cache_size = 2000
+mysqli.default_port = 3306
+mysqli.reconnect = Off
+
+[Session]
+session.save_handler = files
+session.use_strict_mode = 0
+session.use_cookies = 1
+session.use_only_cookies = 1
+session.name = PHPSESSID
+session.auto_start = 0
+session.cookie_lifetime = 0
+session.cookie_path = /
+session.serialize_handler = php
+session.gc_probability = 0
+session.gc_divisor = 1000
+session.gc_maxlifetime = 1440
+session.cache_limiter = nocache
+session.cache_expire = 180
+session.use_trans_sid = 0
+session.hash_function = 0
+session.hash_bits_per_character = 5
+url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry"

docker/php/Dockerfile

@@ -0,0 +1,9 @@
+FROM php:7.1-fpm-alpine3.9
+
+RUN apk add -U libjpeg-turbo-dev libpng-dev freetype-dev
+RUN docker-php-ext-configure gd \
+        --enable-gd-native-ttf \
+        --with-freetype-dir=/usr/include/freetype2 \
+        --with-png-dir=/usr/include \
+        --with-jpeg-dir=/usr/include
+RUN docker-php-ext-install gd mysqli

docker/stikked-envvars.txt

@@ -1,27 +0,0 @@
-MYSQL_ROOT_PASSWORD=thisREALLYshouldBEchanged
-MYSQL_DATABASE=stikked
-MYSQL_USER=stikked
-MYSQL_PASSWORD=stikked
-
-STIKKED_SITE_NAME=Stikked
-# Note that there is no need to escape the URL
-STIKKED_BASE_URL=http://stikked.local/
-
-# This should match the database container name
-STIKKED_DB_HOSTNAME=db
-
-# These do NOT need to be set, as they will be inherited from
-# the MYSQL_DATABASE settings above. However, you can set them
-# if you are using a seperately managed database.
-#STIKKED_DB_DATABASE=stikked
-#STIKKED_DB_USERNAME=stikked
-#STIKKED_DB_PASSWORD=stikked
-
-# Other random examples
-STIKKED_DISALLOW_SEARCH_ENGINES="true"
-STIKKED_JS_EDITOR="codemirror"
-
-# Example of enabling CAPTCHA
-#STIKKED_ENABLE_CAPTCHA="true"
-#STIKKED_RECAPTCHA_PUBLICKEY="_replace_this_with_your_public_key_"
-#STIKKED_RECAPTCHA_PRIVATEKEY="_replace_this_with_your_private_key_"

docker/stikked.php

@@ -0,0 +1,358 @@
+<?php if (!defined('BASEPATH')) {
+    exit('No direct script access allowed');
+}
+
+/**
+ * Site Name
+ *
+ * The name of your site
+ *
+ */
+$config['site_name'] = 'Stikked';
+
+/**
+ * Base URL
+ *
+ * Set the base URL of Stikked. WITH trailing slash!
+ *
+ */
+$config['base_url'] = 'http://localhost/';
+
+/**
+ * Database connection
+ *
+ * Credentials for your database
+ * The database structure will be created automatically
+ *
+ */
+$config['db_hostname'] = 'mysql';
+$config['db_database'] = 'stikked';
+$config['db_username'] = 'stikked';
+$config['db_password'] = 'stikked';
+
+// If you are using sqlite:
+// uncomment the configuration lines below.
+//$config['db_database'] = 'db/stikked'; // you need to create a directory "db" and give the webserver write access. sqlite needs a writable folder to work properly!
+//$config['db_driver'] = 'sqlite';
+
+/**
+ * Table prefix
+ * Generate table prefix for stikked db, commonly used if the webhoster only has one db.
+ * Use underscore as suffix to easily see the tables.
+ * example: $config['db_prefix'] = 'stikked_';
+ * use $config['db_prefix'] = ''; if you don't want to use table prefix.
+ */
+$config['db_prefix'] = '';
+
+/**
+ * Theme
+ *
+ * Which theme to use
+ * Folder name in htdocs/themes/
+ * Currently: default, bootstrap, gabdark, gabdark3, geocities, snowkat, stikkedizr, cleanwhite, i386
+ *
+ */
+$config['theme'] = 'default';
+
+/**
+ * Display QR code
+ *
+ * Whether or not to display the QR code
+ *
+ */
+$config['qr_enabled'] = true;
+
+/**
+ * JavaScript-Editor
+ *
+ * Which editor to use
+ * CodeMirror, ACE or none
+ *
+ * none:        ~130kb JS
+ * CodeMirror:  ~300kb JS
+ * ACE:         >800kb JS
+ *
+ */
+$config['js_editor'] = ''; // codemirror, ace, ''
+
+/**
+ * Language
+ *
+ * Which language to use
+ * Translate Stikked to your own language, see htdocs/application/language files
+ * Currently: english, german, swissgerman, spanish, norwegian, danish, portuguese, turkish, french, japanese, polish, russian, chinese-simplified, chinese-traditional, indonesia
+ *
+ */
+$config['language'] = 'english';
+
+/**
+ * Combine JS & CSS files (recommended)
+ *
+ * htdocs/static/asset/ folder must be writeable
+ *
+ */
+$config['combine_assets'] = false; # chown 82 htdocs/static/asset/ for Docker
+
+/**
+ * Content expiration
+ *
+ * Sets the "Expires:"-header to make use of browser-caching
+ * Format: http://php.net/manual/en/function.strtotime.php
+ * Examples: '+10 seconds', '+1 year', '-1 week'
+ *
+ */
+$config['content_expiration'] = '-1 week';
+
+/**
+ * Key for Cron
+ *
+ * The password required to run the cron job */
+// Example cron: */5 * * * * curl --silent http://yoursite.com/cron/[key]
+//
+//
+$config['cron_key'] = '';
+
+/**
+ * url shortener config
+ *
+ * url_shortening_use:
+ *    - Enables specific url shortening engine or disables them all
+ *    - Valid values:
+ *           @string yourls
+ *           @string gwgd
+ *           @string googl
+ *           @string bitly
+ *           @string polr
+ *           @string random - Randomly chose any of upper API-s !WARNING! May be slow! For maximum performanse, it's recommended to either set all API keys or use random_url_engines to list working engines.
+ *           @string none - same as off
+ *
+ * random_url_engines:
+ *    - This variable sets list of APIs to be considered for usage if url_shortening_use is set to 'random'
+ *      To consider all API-s, either leave it empty (as empty array or string) or type all apis available (yourls,gwgd,googl,bitly)
+ *      be aware that considering all the APIs is not recommended because program will test them all, and that affects speed.
+ *      This will greatly improve performance of 'random' mode if listed are only valid, filled APIs.
+ *      Accepted inputs:
+ *           @array array('use this', 'and this', 'and this of course')
+ *           @string 'use this,and this,and this of course'
+ *      - If input is @string it must be comma delimited, otherwise will be ignored.
+ *      - Script will accept minimum of 2 APIs, ignored otherwise
+ *      - Only alphanumeric characters and "." are allowed. Everything else is filtered out.
+ *
+ * -------------------------------------------------------------------------------------------------------------
+ * yourls_url: Your own instance of yourls URL-shortener (Download: http://yourls.org/)
+ * Example: http://example.com/yourls/
+ *
+ * yourls_signature: Your signature, used to authenticate API requests.
+ * You can find your signature under http://your-yourls-installation.com/admin/tools.php
+ *
+ * gwgd_url: Your own instance of the gw.gd URL-shortener (Download: https://github.com/neofutur/gwgd)
+ * Default: http://gw.gd/
+ *
+ * googl_url_api: URL shortening service provided by Google Inc. (API: http://code.google.com/apis/console/)
+ * Usage: Your API key
+ *
+ * bitly_url_api: Famous URL shortening service (API: http://dev.bitly.com/get_started.html)
+ * Usage: Your API key
+ *
+ * polr_url: Your own instance of polr URL-shortener (Download: https://github.com/cydrobolt/polr)
+ * polr_api: Your polr api key
+ *
+ **/
+$config['url_shortening_use'] = 'off';
+$config['random_url_engines'] = 'googl,bitly'; // Used only in random mode, read comment above for more info
+
+// Yourls
+$config['yourls_url'] = '';
+$config['yourls_signature'] = '';
+
+// gwgd_url
+$config['gwgd_url'] = '';
+$config['shorturl_selected'] = false;
+
+// goo.gl API key
+$config['googl_url_api'] = '';
+
+// Bit.ly API key
+$config['bitly_url_api'] = '';
+
+// polr
+$config['polr_url'] = '';
+$config['polr_api'] = '';
+
+/**
+ * Credentials for the backup URL
+ *
+ * Basic auth user & pass for the backup URL, accessible via http://yoursite.com/backup
+ *
+ **/
+$config['backup_user'] = '';
+$config['backup_pass'] = '';
+
+/**
+ * Pastes Per Page
+ *
+ * Number of pastes per page, on the recent pastes listings.
+ *
+ **/
+$config['per_page'] = 15;
+
+/**
+ * API key
+ *
+ * Require a key to interact with the API.
+ * Append to all API requests: ?apikey=[yourkey]
+ *
+ **/
+$config['apikey'] = '';
+
+/**
+ * Soft API
+ *
+ * When set to true, allow interaction:
+ *   without apikey: badword-check applies
+ *   with apikey: badwords are ignored
+ *
+ * This is useful to maintain a restrictive blocklist
+ * for spammers and bypass it using the apikey.
+ *
+ **/
+$config['soft_api'] = false;
+
+/**
+ * Anti spam
+ *
+ * private_only: No recent pastes will be displayed.
+ * enable_captcha: Users must enter a captcha to post.
+ * recaptcha_publickey & recaptcha_privatekey: If filled, reCaptcha will be used (get a key from https://www.google.com/recaptcha/admin/create)
+ * disable_api: Don't allow pasting via API (because we can't use a captcha there...)
+ * disable_keep_forever: Don't allow pasting without expiration
+ * blocked_words: Comma separated list, e.g. '.es.tl, mycraft.com, yourbadword'
+ * disable_shorturl: "Create Shorturl" option will be disabled
+ * disallow_search_engines: displays a robots.txt that forbids indexing
+ *
+ **/
+$config['private_only'] = false;
+$config['enable_captcha'] = true;
+$config['recaptcha_publickey'] = '';
+$config['recaptcha_privatekey'] = '';
+$config['disable_api'] = false;
+$config['disable_keep_forever'] = false;
+$config['blocked_words'] = '';
+$config['disable_shorturl'] = false;
+$config['disallow_search_engines'] = false;
+
+//spamadmin: accessible via /spamadmin (only active when user + pass is set)
+$config['spamadmin_user'] = '';
+$config['spamadmin_pass'] = '';
+
+/**
+ * Default paste expiration time (minutes)
+ *
+ * Possible values:
+ *  burn (burn on reading)
+ *  5 (5 minutes)
+ *  60 (1 hour)
+ *  1440 (1 day)
+ *  10080 (1 week)
+ *  40320 (1 month)
+ *  483840 (1 year)
+ *  0 (keep forever)
+ **/
+$config['default_expiration'] = 0;
+
+/**
+ * Default language
+ *
+ * Preselected language. See application/config/geshi_languages.php for valid values (array keys)
+ *
+ **/
+$config['default_language'] = 'text';
+
+/**
+ * Name for anonymous poster
+ *
+ * What name is to be set for anonymous posters
+ * DO NOT SET BLANK
+ * Set to random for a random paste to be generated
+ * NOTE: if changed only pastes from then on will be updated.
+ *
+ **/
+$config['unknown_poster'] = 'random';
+
+/**
+ * Name for untitled pastes
+ *
+ * What name is to be set for untitled pastes.
+ * DO NOT SET BLANK
+ * NOTE: if changed only pastes from then on will be updated.
+ **/
+$config['unknown_title'] = 'Untitled';
+
+/**
+ * To require LDAP authentication or not.
+ *
+ * Weather to require LDAP authenticaiton or not.
+ * Set to either 'true' to require authentication or 'false' not to.
+ * NOTE: if changed, set LDAP settings in auth_ldap.php
+ **/
+$config['require_auth'] = false;
+
+/**
+ * Override the displayed URL
+ *
+ * Display this URL in a paste's detail view instead of the main URL - e.g. if you use mod_rewrite
+ * Variable $id: the paste_id
+ * Example: 'http://example.com/$id'
+ *
+ **/
+$config['displayurl_override'] = '';
+
+/**
+ *
+ *
+ *  Words used for when unknown_poster is set to random
+ *
+ *
+ **/
+$config['nouns'] = array('Hornbill', 'Elephant', 'Bison', 'Lion', 'Camel', 'Sheep',
+    'Monkey', 'Prairie Dog', 'Plover', 'Tapir', 'Capybara', 'Cheetah', 'Flamingo', 'Peccary', 'Eider', 'Porcupine', 'Pelican', 'Dove', 'Crane', 'Tortoise', 'Agouti',
+    'Tamarin', 'Pheasant', 'Owl', 'Gibbon', 'Goose', 'Baboon', 'Hamerkop', 'Zebra',
+    'Macaw', 'Gibbon', 'Madrill', 'Wolf', 'Stork', 'Armadillo', 'Ostrich', 'Marmoset',
+    'Lizard', 'Panda', 'Giraffe', 'Cassowary', 'Kangaroo', 'Gorilla', 'Pheasant',
+    'Finch', 'Duck', 'Matamata', 'Teal', 'Macaque', 'Goat', 'Lechwe', 'Ibis', 'Parrot',
+    'Parakeet', 'Bongo', 'Pudu', 'Echidna', 'Lemur', 'Bat', 'Curlew', 'Terrapin',
+    'Peafowl', 'Duck', 'Owl', 'Parakeet', 'Meerkat', 'Tern', 'Wigeon', 'Pintail',
+    'Meerkat', 'Motmot', 'Motmot', 'Shama', 'Dormouse', 'Horse', 'Rhinoceros', 'Sloth',
+    'Mousedeer', 'Treeshrew', 'Bushbaby', 'Guinea Pig', 'Agouti', 'Water Vole', 'Hog',
+    'Pig', 'Anoa', 'Octupus', 'Butterfly', 'Cat', 'Kitten', 'Coyote', 'Crocodile',
+    'Cockroach', 'Crow', 'Bird', 'Dolphin', 'Earthworm', 'Frog', 'Hamster', 'Hedgehog',
+    'Hog', 'Human', 'Hummingbird', 'Iguana', 'Leech', 'Leopard', ' Marten',
+    'Mockingbird', 'Mockingjay', 'Mosquito', 'Moth', 'Partdridge', 'Bee', 'Penguin');
+
+$config['adjectives'] = array('Ample', 'Mature', 'Bulky', 'Burly', 'Capacious',
+    'Colossal', 'Commodious', 'Thundering', 'Mammoth', 'Mungo', 'Voluminous',
+    'Walloping', 'Tiny', 'Baby', 'Bitty', 'Diminutive', 'Little', 'Paltry', 'Scanty',
+    'Trivial', 'Scribby', 'Blush', 'Tinct', 'Colorant', 'Aqua', 'Beige', 'Bistre',
+    'Buff', 'Bistre', 'Chartreuse', 'Chocolate', 'Cobalt', 'Coral', 'Cream', 'Crimson',
+    'Denim', 'Emerald', 'Gray', 'Gamboge', 'Ivory', 'Mustard', 'Silly', 'Perl',
+    'Whipped', 'Violet', 'Harmless', 'Gentle', 'Innocent', 'Reliable', 'Unreliable',
+    'Soft', 'Toxic', 'Anorexic', 'Beefy', 'Sexy', 'Morose', 'Rude', 'Ungracious',
+    'Abrupt', 'Gracious', 'Queen', 'Cute', 'Edgy', 'Insensitive', 'Round', 'Sharp',
+    'Gruff', 'Subtle', 'Crippled', 'Eratic', 'Social', 'Jittery', 'Sole', 'Unique',
+    'Botched', 'Tacky', 'Sludgy', 'Stained', 'Wet', 'Soiled', 'Big', 'Small', 'Sloppy',
+    'Smelly', 'Funky', 'Putrid', 'Melodic', 'Corrupt', 'Lousy', 'Fiery', 'Red',
+    'Sweet', 'Hot', 'Scorching', 'Sweltering', 'Torrid', 'Obese', 'Speedy', 'Flying',
+    'Idiotic', 'Chunky', 'Forensic');
+
+/**
+ *
+ *
+ *  Words used for expiring pastes
+ *
+ *
+ **/
+$config['expires'] = array('expire', 'perish', 'go to its last resting place',
+    'go to meet its maker', 'cross the great divide', 'slip away', 'give up the ghost',
+    'kick the bucket', 'croak', 'bite the big one', 'check out', 'buy the farm',
+    'join the choir invisible', 'shuffle off the mortal coil', 'hop the perch',
+    'run down the curtain', 'die', 'self destruct', 'explode');

htdocs/.htaccess

@@ -9,11 +9,11 @@ RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
 SetOutputFilter DEFLATE
 FileETag MTime Size
 
-<IfModule !mod_rewrite>
+<IfModule !mod_rewrite.c>
     ErrorDocument 404 /index.php
 </IfModule>
 
-<IfModule mod_expires>
+<IfModule mod_expires.c>
     ExpiresActive On
     ExpiresByType text/javascript "access plus 1 year"
     ExpiresByType application/x-javascript "access plus 1 year"
@@ -35,5 +35,3 @@ FileETag MTime Size
 #AuthName "Backend"
 #AuthUserFile /path/to/.htpasswd #create one with htpasswd -c .htpasswd username
 #Require user username
-
-AddHandler php5-fastcgi .php .php5

htdocs/application/config/ace_languages.php

@@ -1,11 +1,6 @@
-<?php
+<?php if (!defined('BASEPATH')) {
-/**
+    exit('No direct script access allowed');
- * Class and Function List:
+}
- * Function list:
- * Classes list:
- */
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 //codemirror languages
 $config['ace_languages'] = array(

htdocs/application/config/auth_ldap.php

@@ -1,4 +1,7 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if (!defined('BASEPATH')) {
+    exit('No direct script access allowed');
+}
+
 /*
  * This file is part of Auth_Ldap.
 
@@ -56,4 +59,3 @@ $config['roles'] = array(1 => 'User',
     5 => 'Administrator');
 $config['member_attribute'] = 'memberUid';
 $config['auditlog'] = 'application/logs/audit.log'; // Some place to log attempted logins (separate from message log)
-?>

htdocs/application/config/autoload.php

@@ -1,4 +1,7 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if (!defined('BASEPATH')) {
+    exit('No direct script access allowed');
+}
+
 /*
 | -------------------------------------------------------------------
 | AUTO-LOADER
@@ -39,7 +42,6 @@
 
 $autoload['packages'] = array();
 
-
 /*
 | -------------------------------------------------------------------
 |  Auto-load Libraries
@@ -54,7 +56,6 @@ $autoload['packages'] = array();
 
 $autoload['libraries'] = array('database', 'carabiner');
 
-
 /*
 | -------------------------------------------------------------------
 |  Auto-load Helper Files
@@ -66,7 +67,6 @@ $autoload['libraries'] = array('database', 'carabiner');
 
 $autoload['helper'] = array('url', 'date', 'language');
 
-
 /*
 | -------------------------------------------------------------------
 |  Auto-load Config files
@@ -82,7 +82,6 @@ $autoload['helper'] = array('url', 'date', 'language');
 
 $autoload['config'] = array('stikked');
 
-
 /*
 | -------------------------------------------------------------------
 |  Auto-load Language files
@@ -98,7 +97,6 @@ $autoload['config'] = array('stikked');
 
 $autoload['language'] = array('stikked');
 
-
 /*
 | -------------------------------------------------------------------
 |  Auto-load Models
@@ -111,6 +109,5 @@ $autoload['language'] = array('stikked');
 
 $autoload['model'] = array();
 
-
 /* End of file autoload.php */
 /* Location: ./application/config/autoload.php */

htdocs/application/config/codemirror_languages.php

@@ -1,11 +1,6 @@
-<?php
+<?php if (!defined('BASEPATH')) {
-/**
+    exit('No direct script access allowed');
- * Class and Function List:
+}
- * Function list:
- * Classes list:
- */
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 //codemirror languages
 $config['codemirror_languages'] = array(
@@ -13,16 +8,16 @@ $config['codemirror_languages'] = array(
         'mode' => 'htmlmixed',
         'js' => array(
             array(
-				'codemirror/mode/xml/xml.js'
+                'codemirror/mode/xml/xml.js',
             ),
             array(
-				'codemirror/mode/javascript/javascript.js'
+                'codemirror/mode/javascript/javascript.js',
             ),
             array(
-				'codemirror/mode/css/css.js'
+                'codemirror/mode/css/css.js',
             ),
             array(
-				'codemirror/mode/htmlmixed/htmlmixed.js'
+                'codemirror/mode/htmlmixed/htmlmixed.js',
             ),
         ),
     ),
@@ -30,7 +25,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'css',
         'js' => array(
             array(
-				'codemirror/mode/css/css.js'
+                'codemirror/mode/css/css.js',
             ),
         ),
     ),
@@ -38,7 +33,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'javascript',
         'js' => array(
             array(
-				'codemirror/mode/javascript/javascript.js'
+                'codemirror/mode/javascript/javascript.js',
             ),
         ),
     ),
@@ -46,19 +41,19 @@ $config['codemirror_languages'] = array(
         'mode' => 'php',
         'js' => array(
             array(
-				'codemirror/mode/xml/xml.js'
+                'codemirror/mode/xml/xml.js',
             ),
             array(
-				'codemirror/mode/javascript/javascript.js'
+                'codemirror/mode/javascript/javascript.js',
             ),
             array(
-				'codemirror/mode/css/css.js'
+                'codemirror/mode/css/css.js',
             ),
             array(
-				'codemirror/mode/clike/clike.js'
+                'codemirror/mode/clike/clike.js',
             ),
             array(
-				'codemirror/mode/php/php.js'
+                'codemirror/mode/php/php.js',
             ),
         ),
     ),
@@ -66,7 +61,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'python',
         'js' => array(
             array(
-				'codemirror/mode/python/python.js'
+                'codemirror/mode/python/python.js',
             ),
         ),
     ),
@@ -74,7 +69,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'ruby',
         'js' => array(
             array(
-				'codemirror/mode/ruby/ruby.js'
+                'codemirror/mode/ruby/ruby.js',
             ),
         ),
     ),
@@ -82,7 +77,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-lua',
         'js' => array(
             array(
-				'codemirror/mode/lua/lua.js'
+                'codemirror/mode/lua/lua.js',
             ),
         ),
     ),
@@ -90,7 +85,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-sh',
         'js' => array(
             array(
-				'codemirror/mode/shell/shell.js'
+                'codemirror/mode/shell/shell.js',
             ),
         ),
     ),
@@ -98,7 +93,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-go',
         'js' => array(
             array(
-				'codemirror/mode/go/go.js'
+                'codemirror/mode/go/go.js',
             ),
         ),
     ),
@@ -106,7 +101,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-csrc',
         'js' => array(
             array(
-				'codemirror/mode/clike/clike.js'
+                'codemirror/mode/clike/clike.js',
             ),
         ),
     ),
@@ -114,7 +109,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-c++src',
         'js' => array(
             array(
-				'codemirror/mode/clike/clike.js'
+                'codemirror/mode/clike/clike.js',
             ),
         ),
     ),
@@ -122,7 +117,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'diff',
         'js' => array(
             array(
-				'codemirror/mode/diff/diff.js'
+                'codemirror/mode/diff/diff.js',
             ),
         ),
     ),
@@ -130,7 +125,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'stex',
         'js' => array(
             array(
-				'codemirror/mode/stex/stex.js'
+                'codemirror/mode/stex/stex.js',
             ),
         ),
     ),
@@ -138,7 +133,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'sql',
         'js' => array(
             array(
-				'codemirror/mode/sql/sql.js'
+                'codemirror/mode/sql/sql.js',
             ),
         ),
     ),
@@ -146,7 +141,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'xml',
         'js' => array(
             array(
-				'codemirror/mode/xml/xml.js'
+                'codemirror/mode/xml/xml.js',
             ),
         ),
     ),
@@ -161,7 +156,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'apl',
         'js' => array(
             array(
-				'codemirror/mode/apl/apl.js'
+                'codemirror/mode/apl/apl.js',
             ),
         ),
     ),
@@ -169,7 +164,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'asterisk',
         'js' => array(
             array(
-				'codemirror/mode/asterisk/asterisk.js'
+                'codemirror/mode/asterisk/asterisk.js',
             ),
         ),
     ),
@@ -198,7 +193,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-csrc',
         'js' => array(
             array(
-				'codemirror/mode/clike/clike.js'
+                'codemirror/mode/clike/clike.js',
             ),
         ),
     ),
@@ -206,7 +201,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-csrc',
         'js' => array(
             array(
-				'codemirror/mode/clike/clike.js'
+                'codemirror/mode/clike/clike.js',
             ),
         ),
     ),
@@ -224,7 +219,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-coffeescript',
         'js' => array(
             array(
-				'codemirror/mode/coffeescript/coffeescript.js'
+                'codemirror/mode/coffeescript/coffeescript.js',
             ),
         ),
     ),
@@ -232,7 +227,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-csharp',
         'js' => array(
             array(
-				'codemirror/mode/clike/clike.js'
+                'codemirror/mode/clike/clike.js',
             ),
         ),
     ),
@@ -241,7 +236,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'd',
         'js' => array(
             array(
-				'codemirror/mode/d/d.js'
+                'codemirror/mode/d/d.js',
             ),
         ),
     ),
@@ -255,7 +250,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'javascript',
         'js' => array(
             array(
-				'codemirror/mode/javascript/javascript.js'
+                'codemirror/mode/javascript/javascript.js',
             ),
         ),
     ),
@@ -266,7 +261,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'erlang',
         'js' => array(
             array(
-				'codemirror/mode/erlang/erlang.js'
+                'codemirror/mode/erlang/erlang.js',
             ),
         ),
     ),
@@ -289,7 +284,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'go',
         'js' => array(
             array(
-				'codemirror/mode/go/go.js'
+                'codemirror/mode/go/go.js',
             ),
         ),
     ),
@@ -297,7 +292,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-groovy',
         'js' => array(
             array(
-				'codemirror/mode/groovy/groovy.js'
+                'codemirror/mode/groovy/groovy.js',
             ),
         ),
     ),
@@ -306,7 +301,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-haskell',
         'js' => array(
             array(
-				'codemirror/mode/haskell/haskell.js'
+                'codemirror/mode/haskell/haskell.js',
             ),
         ),
     ),
@@ -314,7 +309,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-haxe',
         'js' => array(
             array(
-				'codemirror/mode/haxe/haxe.js'
+                'codemirror/mode/haxe/haxe.js',
             ),
         ),
     ),
@@ -324,16 +319,16 @@ $config['codemirror_languages'] = array(
         'mode' => 'htmlmixed',
         'js' => array(
             array(
-				'codemirror/mode/xml/xml.js'
+                'codemirror/mode/xml/xml.js',
             ),
             array(
-				'codemirror/mode/javascript/javascript.js'
+                'codemirror/mode/javascript/javascript.js',
             ),
             array(
-				'codemirror/mode/css/css.js'
+                'codemirror/mode/css/css.js',
             ),
             array(
-				'codemirror/mode/htmlmixed/htmlmixed.js'
+                'codemirror/mode/htmlmixed/htmlmixed.js',
             ),
         ),
     ),
@@ -348,7 +343,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-java',
         'js' => array(
             array(
-				'codemirror/mode/clike/clike.js'
+                'codemirror/mode/clike/clike.js',
             ),
         ),
     ),
@@ -356,7 +351,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-java',
         'js' => array(
             array(
-				'codemirror/mode/clike/clike.js'
+                'codemirror/mode/clike/clike.js',
             ),
         ),
     ),
@@ -364,7 +359,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'javascript',
         'js' => array(
             array(
-				'codemirror/mode/javascript/javascript.js'
+                'codemirror/mode/javascript/javascript.js',
             ),
         ),
     ),
@@ -391,7 +386,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'mirc',
         'js' => array(
             array(
-				'codemirror/mode/mirc/mirc.js'
+                'codemirror/mode/mirc/mirc.js',
             ),
         ),
     ),
@@ -404,7 +399,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'sql',
         'js' => array(
             array(
-				'codemirror/mode/sql/sql.js'
+                'codemirror/mode/sql/sql.js',
             ),
         ),
     ),
@@ -418,7 +413,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-ocaml',
         'js' => array(
             array(
-				'codemirror/mode/ocaml/ocaml.js'
+                'codemirror/mode/ocaml/ocaml.js',
             ),
         ),
     ),
@@ -431,7 +426,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-pascal',
         'js' => array(
             array(
-				'codemirror/mode/pascal/pascal.js'
+                'codemirror/mode/pascal/pascal.js',
             ),
         ),
     ),
@@ -441,7 +436,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'perl',
         'js' => array(
             array(
-				'codemirror/mode/perl/perl.js'
+                'codemirror/mode/perl/perl.js',
             ),
         ),
     ),
@@ -449,7 +444,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'perl',
         'js' => array(
             array(
-				'codemirror/mode/perl/perl.js'
+                'codemirror/mode/perl/perl.js',
             ),
         ),
     ),
@@ -462,7 +457,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'sql',
         'js' => array(
             array(
-				'codemirror/mode/sql/sql.js'
+                'codemirror/mode/sql/sql.js',
             ),
         ),
     ),
@@ -477,7 +472,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-properties',
         'js' => array(
             array(
-				'codemirror/mode/properties/properties.js'
+                'codemirror/mode/properties/properties.js',
             ),
         ),
     ),
@@ -487,7 +482,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-q',
         'js' => array(
             array(
-				'codemirror/mode/q/q.js'
+                'codemirror/mode/q/q.js',
             ),
         ),
     ),
@@ -503,7 +498,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'scala',
         'js' => array(
             array(
-				'codemirror/mode/clike/clike.js'
+                'codemirror/mode/clike/clike.js',
             ),
         ),
     ),
@@ -511,7 +506,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-scheme',
         'js' => array(
             array(
-				'codemirror/mode/scheme/scheme.js'
+                'codemirror/mode/scheme/scheme.js',
             ),
         ),
     ),
@@ -524,7 +519,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-tcl',
         'js' => array(
             array(
-				'codemirror/mode/tcl/tcl.js'
+                'codemirror/mode/tcl/tcl.js',
             ),
         ),
     ),
@@ -539,7 +534,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-vb',
         'js' => array(
             array(
-				'codemirror/mode/vb/vb.js'
+                'codemirror/mode/vb/vb.js',
             ),
         ),
     ),
@@ -547,7 +542,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-verilog',
         'js' => array(
             array(
-				'codemirror/mode/verilog/verilog.js'
+                'codemirror/mode/verilog/verilog.js',
             ),
         ),
     ),
@@ -565,7 +560,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-yaml',
         'js' => array(
             array(
-				'codemirror/mode/yaml/yaml.js'
+                'codemirror/mode/yaml/yaml.js',
             ),
         ),
     ),
@@ -573,7 +568,7 @@ $config['codemirror_languages'] = array(
         'mode' => 'text/x-z80',
         'js' => array(
             array(
-				'codemirror/mode/z80/z80.js'
+                'codemirror/mode/z80/z80.js',
             ),
         ),
     ),

htdocs/application/config/config.php

@@ -1,4 +1,6 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if (!defined('BASEPATH')) {
+    exit('No direct script access allowed');
+}
 
 /*
 |--------------------------------------------------------------------------
@@ -101,8 +103,7 @@ $config['charset'] = 'UTF-8';
 | setting this variable to TRUE (boolean).  See the user guide for details.
 |
  */
-$config['enable_hooks'] = TRUE;
+$config['enable_hooks'] = false;
-
 
 /*
 |--------------------------------------------------------------------------
@@ -118,7 +119,6 @@ $config['enable_hooks'] = TRUE;
  */
 $config['subclass_prefix'] = 'MY_';
 
-
 /*
 |--------------------------------------------------------------------------
 | Allowed URL Characters
@@ -138,7 +138,6 @@ $config['subclass_prefix'] = 'MY_';
  */
 $config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-';
 
-
 /*
 |--------------------------------------------------------------------------
 | Enable Query Strings
@@ -164,8 +163,8 @@ $config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-';
 | use segment based URLs.
 |
  */
-$config['allow_get_array']		= TRUE;
+$config['allow_get_array'] = true;
-$config['enable_query_strings'] = FALSE;
+$config['enable_query_strings'] = false;
 $config['controller_trigger'] = 'c';
 $config['function_trigger'] = 'm';
 $config['directory_trigger'] = 'd'; // experimental not currently in use
@@ -288,9 +287,9 @@ $config['sess_driver'] = 'database';
 $config['sess_cookie_name'] = 'stikked';
 $config['sess_expiration'] = 60 * 60 * 24 * 1;
 $config['sess_save_path'] = 'sessions';
-$config['sess_match_ip'] = FALSE;
+$config['sess_match_ip'] = false;
 $config['sess_time_to_update'] = 300;
-$config['sess_regenerate_destroy'] = FALSE;
+$config['sess_regenerate_destroy'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -310,8 +309,8 @@ $config['sess_regenerate_destroy'] = FALSE;
 $config['cookie_prefix'] = '';
 $config['cookie_domain'] = '';
 $config['cookie_path'] = '/';
-$config['cookie_secure']	= FALSE;
+$config['cookie_secure'] = false;
-$config['cookie_httponly'] 	= FALSE;
+$config['cookie_httponly'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -322,7 +321,7 @@ $config['cookie_httponly'] 	= FALSE;
 | COOKIE data is encountered
 |
  */
-$config['global_xss_filtering'] = FALSE;
+$config['global_xss_filtering'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -336,7 +335,7 @@ $config['global_xss_filtering'] = FALSE;
 | 'csrf_cookie_name' = The cookie name
 | 'csrf_expire' = The number in seconds the token should expire.
  */
-$config['csrf_protection'] = FALSE;
+$config['csrf_protection'] = false;
 $config['csrf_token_name'] = 'csrf_test_name';
 $config['csrf_cookie_name'] = 'csrf_cookie_name';
 $config['csrf_expire'] = 7200;
@@ -358,7 +357,7 @@ $config['csrf_expire'] = 7200;
 | by the output class.  Do not 'echo' any values with compression enabled.
 |
  */
-$config['compress_output'] = FALSE;
+$config['compress_output'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -373,7 +372,6 @@ $config['compress_output'] = FALSE;
  */
 $config['time_reference'] = 'local';
 
-
 /*
 |--------------------------------------------------------------------------
 | Rewrite PHP Short Tags
@@ -384,8 +382,7 @@ $config['time_reference'] = 'local';
 | in your view files.  Options are TRUE or FALSE (boolean)
 |
  */
-$config['rewrite_short_tags'] = FALSE;
+$config['rewrite_short_tags'] = false;
-
 
 /*
 |--------------------------------------------------------------------------

htdocs/application/config/constants.php

@@ -1,5 +1,4 @@
-<?php
+<?php defined('BASEPATH') or exit('No direct script access allowed');
-defined('BASEPATH') OR exit('No direct script access allowed');
 
 /*
 |--------------------------------------------------------------------------
@@ -11,7 +10,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 | of this setting
 |
  */
-defined('SHOW_DEBUG_BACKTRACE') OR define('SHOW_DEBUG_BACKTRACE', TRUE);
+defined('SHOW_DEBUG_BACKTRACE') or define('SHOW_DEBUG_BACKTRACE', true);
 
 /*
 |--------------------------------------------------------------------------
@@ -26,10 +25,10 @@ defined('SHOW_DEBUG_BACKTRACE') OR define('SHOW_DEBUG_BACKTRACE', TRUE);
 | always be used to set the mode correctly.
 |
  */
-defined('FILE_READ_MODE')  OR define('FILE_READ_MODE', 0644);
+defined('FILE_READ_MODE') or define('FILE_READ_MODE', 0644);
-defined('FILE_WRITE_MODE') OR define('FILE_WRITE_MODE', 0666);
+defined('FILE_WRITE_MODE') or define('FILE_WRITE_MODE', 0666);
-defined('DIR_READ_MODE')   OR define('DIR_READ_MODE', 0755);
+defined('DIR_READ_MODE') or define('DIR_READ_MODE', 0755);
-defined('DIR_WRITE_MODE')  OR define('DIR_WRITE_MODE', 0755);
+defined('DIR_WRITE_MODE') or define('DIR_WRITE_MODE', 0755);
 
 /*
 |--------------------------------------------------------------------------
@@ -39,14 +38,14 @@ defined('DIR_WRITE_MODE')  OR define('DIR_WRITE_MODE', 0755);
 | These modes are used when working with fopen()/popen()
 |
  */
-defined('FOPEN_READ')                           OR define('FOPEN_READ', 'rb');
+defined('FOPEN_READ') or define('FOPEN_READ', 'rb');
-defined('FOPEN_READ_WRITE')                     OR define('FOPEN_READ_WRITE', 'r+b');
+defined('FOPEN_READ_WRITE') or define('FOPEN_READ_WRITE', 'r+b');
-defined('FOPEN_WRITE_CREATE_DESTRUCTIVE')       OR define('FOPEN_WRITE_CREATE_DESTRUCTIVE', 'wb'); // truncates existing file data, use with care
+defined('FOPEN_WRITE_CREATE_DESTRUCTIVE') or define('FOPEN_WRITE_CREATE_DESTRUCTIVE', 'wb'); // truncates existing file data, use with care
-defined('FOPEN_READ_WRITE_CREATE_DESTRUCTIVE')  OR define('FOPEN_READ_WRITE_CREATE_DESTRUCTIVE', 'w+b'); // truncates existing file data, use with care
+defined('FOPEN_READ_WRITE_CREATE_DESTRUCTIVE') or define('FOPEN_READ_WRITE_CREATE_DESTRUCTIVE', 'w+b'); // truncates existing file data, use with care
-defined('FOPEN_WRITE_CREATE')                   OR define('FOPEN_WRITE_CREATE', 'ab');
+defined('FOPEN_WRITE_CREATE') or define('FOPEN_WRITE_CREATE', 'ab');
-defined('FOPEN_READ_WRITE_CREATE')              OR define('FOPEN_READ_WRITE_CREATE', 'a+b');
+defined('FOPEN_READ_WRITE_CREATE') or define('FOPEN_READ_WRITE_CREATE', 'a+b');
-defined('FOPEN_WRITE_CREATE_STRICT')            OR define('FOPEN_WRITE_CREATE_STRICT', 'xb');
+defined('FOPEN_WRITE_CREATE_STRICT') or define('FOPEN_WRITE_CREATE_STRICT', 'xb');
-defined('FOPEN_READ_WRITE_CREATE_STRICT')       OR define('FOPEN_READ_WRITE_CREATE_STRICT', 'x+b');
+defined('FOPEN_READ_WRITE_CREATE_STRICT') or define('FOPEN_READ_WRITE_CREATE_STRICT', 'x+b');
 
 /*
 |--------------------------------------------------------------------------
@@ -73,13 +72,13 @@ defined('FOPEN_READ_WRITE_CREATE_STRICT')       OR define('FOPEN_READ_WRITE_CREA
 |       http://tldp.org/LDP/abs/html/exitcodes.html
 |
  */
-defined('EXIT_SUCCESS')        OR define('EXIT_SUCCESS', 0); // no errors
+defined('EXIT_SUCCESS') or define('EXIT_SUCCESS', 0); // no errors
-defined('EXIT_ERROR')          OR define('EXIT_ERROR', 1); // generic error
+defined('EXIT_ERROR') or define('EXIT_ERROR', 1); // generic error
-defined('EXIT_CONFIG')         OR define('EXIT_CONFIG', 3); // configuration error
+defined('EXIT_CONFIG') or define('EXIT_CONFIG', 3); // configuration error
-defined('EXIT_UNKNOWN_FILE')   OR define('EXIT_UNKNOWN_FILE', 4); // file not found
+defined('EXIT_UNKNOWN_FILE') or define('EXIT_UNKNOWN_FILE', 4); // file not found
-defined('EXIT_UNKNOWN_CLASS')  OR define('EXIT_UNKNOWN_CLASS', 5); // unknown class
+defined('EXIT_UNKNOWN_CLASS') or define('EXIT_UNKNOWN_CLASS', 5); // unknown class
-defined('EXIT_UNKNOWN_METHOD') OR define('EXIT_UNKNOWN_METHOD', 6); // unknown class member
+defined('EXIT_UNKNOWN_METHOD') or define('EXIT_UNKNOWN_METHOD', 6); // unknown class member
-defined('EXIT_USER_INPUT')     OR define('EXIT_USER_INPUT', 7); // invalid user input
+defined('EXIT_USER_INPUT') or define('EXIT_USER_INPUT', 7); // invalid user input
-defined('EXIT_DATABASE')       OR define('EXIT_DATABASE', 8); // database error
+defined('EXIT_DATABASE') or define('EXIT_DATABASE', 8); // database error
-defined('EXIT__AUTO_MIN')      OR define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code
+defined('EXIT__AUTO_MIN') or define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code
-defined('EXIT__AUTO_MAX')      OR define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code
+defined('EXIT__AUTO_MAX') or define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code

htdocs/application/config/database.php

@@ -1,5 +1,7 @@
-<?php
+<?php if (!defined('BASEPATH')) {
-if (!defined('BASEPATH')) exit('No direct script access allowed');
+    exit('No direct script access allowed');
+}
+
 /*
 | -------------------------------------------------------------------
 | DATABASE CONNECTIVITY SETTINGS
@@ -71,39 +73,33 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
  */
 
 $active_group = 'default';
-$query_builder = TRUE;
+$query_builder = true;
 $CI = &get_instance();
 
-if ($CI->config->item('db_driver') == 'sqlite') 
+if ($CI->config->item('db_driver') == 'sqlite') {
-{
     $db['default']['database'] = $CI->config->item('db_database') . '.db';
     $db['default']['dbdriver'] = 'sqlite3';
-}
+} else {
-else
-{
     $db['default']['hostname'] = $CI->config->item('db_hostname');
     $db['default']['username'] = $CI->config->item('db_username');
     $db['default']['password'] = $CI->config->item('db_password');
     $db['default']['database'] = $CI->config->item('db_database');
-	if (null !== $CI->config->item('db_driver'))
+    if (null !== $CI->config->item('db_driver')) {
-	{
         $db['default']['dbdriver'] = $CI->config->item('db_driver');
-	}
+    } else {
-	else
-	{
         $db['default']['dbdriver'] = 'mysqli';
     }
 }
 $db['default']['dbprefix'] = $CI->config->item('db_prefix');
-$db['default']['pconnect'] = FALSE;
+$db['default']['pconnect'] = false;
-$db['default']['db_debug'] = TRUE;
+$db['default']['db_debug'] = true;
-$db['default']['cache_on'] = FALSE;
+$db['default']['cache_on'] = false;
 $db['default']['cachedir'] = '';
 $db['default']['char_set'] = 'utf8';
 $db['default']['dbcollat'] = 'utf8_general_ci';
 $db['default']['swap_pre'] = '';
-$db['default']['autoinit'] = TRUE;
+$db['default']['autoinit'] = true;
-$db['default']['stricton'] = FALSE;
+$db['default']['stricton'] = false;
 
 /* End of file database.php */
 /* Location: ./application/config/database.php */

htdocs/application/config/doctypes.php

@@ -1,4 +1,6 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if (!defined('BASEPATH')) {
+    exit('No direct script access allowed');
+}
 
 $_doctypes = array(
     'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
@@ -8,7 +10,7 @@ $_doctypes = array(
     'html5' => '<!DOCTYPE html>',
     'html4-strict' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
     'html4-trans' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
-					'html4-frame'	=> '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">'
+    'html4-frame' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
 );
 
 /* End of file doctypes.php */

htdocs/application/config/foreign_chars.php

@@ -1,4 +1,7 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if (!defined('BASEPATH')) {
+    exit('No direct script access allowed');
+}
+
 /*
 | -------------------------------------------------------------------
 | Foreign Characters
@@ -57,7 +60,7 @@ $foreign_characters = array(
     '/IJ/' => 'IJ',
     '/ij/' => 'ij',
     '/Œ/' => 'OE',
-	'/ƒ/' => 'f'
+    '/ƒ/' => 'f',
 );
 
 /* End of file foreign_chars.php */

htdocs/application/config/geshi_languages.php

@@ -1,11 +1,6 @@
-<?php
+<?php if (!defined('BASEPATH')) {
-/**
+    exit('No direct script access allowed');
- * Class and Function List:
+}
- * Function list:
- * Classes list:
- */
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 //geshi languages
 $config['geshi_languages'] = array(

htdocs/application/config/hooks.php

@@ -1,4 +1,7 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if (!defined('BASEPATH')) {
+    exit('No direct script access allowed');
+}
+
 /*
 | -------------------------------------------------------------------------
 | Hooks
@@ -10,11 +13,5 @@
 |
  */
 
-$hook['pre_controller'][] = array(
-  'function' => 'pick_language',
-  'filename' => 'pick_language.php',
-  'filepath' => 'hooks'
-);
-
 /* End of file hooks.php */
 /* Location: ./application/config/hooks.php */

htdocs/application/config/migration.php

@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 /*
 |--------------------------------------------------------------------------
 | Enable/Disable Migrations
@@ -8,8 +8,7 @@
 | whenever you intend to do a schema migration.
 |
  */
-$config['migration_enabled'] = FALSE;
+$config['migration_enabled'] = false;
-
 
 /*
 |--------------------------------------------------------------------------
@@ -23,7 +22,6 @@ $config['migration_enabled'] = FALSE;
  */
 $config['migration_version'] = 0;
 
-
 /*
 |--------------------------------------------------------------------------
 | Migrations Path
@@ -36,6 +34,5 @@ $config['migration_version'] = 0;
  */
 $config['migration_path'] = APPPATH . 'migrations/';
 
-
 /* End of file migration.php */
 /* Location: ./application/config/migration.php */

htdocs/application/config/mimes.php

@@ -1,5 +1,4 @@
-<?php
+<?php defined('BASEPATH') or exit('No direct script access allowed');
-defined('BASEPATH') OR exit('No direct script access allowed');
 
 /*
 | -------------------------------------------------------------------
@@ -180,5 +179,5 @@ return array(
     'odt' => 'application/vnd.oasis.opendocument.text',
     'odm' => 'application/vnd.oasis.opendocument.text-master',
     'ott' => 'application/vnd.oasis.opendocument.text-template',
-	'oth'	=>	'application/vnd.oasis.opendocument.text-web'
+    'oth' => 'application/vnd.oasis.opendocument.text-web',
 );

htdocs/application/config/profiler.php

@@ -1,4 +1,7 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if (!defined('BASEPATH')) {
+    exit('No direct script access allowed');
+}
+
 /*
 | -------------------------------------------------------------------------
 | Profiler Sections
@@ -11,7 +14,5 @@
 |
  */
 
-
-
 /* End of file profiler.php */
 /* Location: ./application/config/profiler.php */

htdocs/application/config/routes.php

@@ -1,4 +1,7 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if (!defined('BASEPATH')) {
+    exit('No direct script access allowed');
+}
+
 /*
 | -------------------------------------------------------------------------
 | URI ROUTING

htdocs/application/config/smileys.php

@@ -1,4 +1,7 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if (!defined('BASEPATH')) {
+    exit('No direct script access allowed');
+}
+
 /*
 | -------------------------------------------------------------------
 | SMILEYS
@@ -58,7 +61,7 @@ $smileys = array(
     ':vampire:' => array('vampire.gif', '19', '19', 'vampire'),
     ':snake:' => array('snake.gif', '19', '19', 'snake'),
     ':exclaim:' => array('exclaim.gif', '19', '19', 'excaim'),
-	':question:'	=>	array('question.gif',		'19',	'19',	'question') // no comma after last item
+    ':question:' => array('question.gif', '19', '19', 'question'), // no comma after last item
 
 );
 

htdocs/application/config/stikked.php.dist

@@ -1,4 +1,6 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php if (!defined('BASEPATH')) {
+    exit('No direct script access allowed');
+}
 
 /**
  * Site Name
@@ -159,7 +161,6 @@ $config['cron_key'] = '';
 $config['url_shortening_use'] = 'off';
 $config['random_url_engines'] = 'googl,bitly'; // Used only in random mode, read comment above for more info
 
-
 // Yourls
 $config['yourls_url'] = '';
 $config['yourls_signature'] = '';
@@ -178,7 +179,6 @@ $config['bitly_url_api'] = '';
 $config['polr_url'] = '';
 $config['polr_api'] = '';
 
-
 /**
  * Credentials for the backup URL
  *

htdocs/application/config/user_agents.php

@@ -1,4 +1,7 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if (!defined('BASEPATH')) {
+    exit('No direct script access allowed');
+}
+
 /*
 | -------------------------------------------------------------------
 | USER AGENT TYPES
@@ -41,10 +44,9 @@ $platforms = array (
     'bsdi' => 'BSDi',
     'openbsd' => 'OpenBSD',
     'gnu' => 'GNU/Linux',
-					'unix'				=> 'Unknown Unix OS'
+    'unix' => 'Unknown Unix OS',
 );
 
-
 // The order of this array should NOT be changed. Many browsers return
 // multiple browser types so we want to identify the sub-type first.
 $browsers = array(
@@ -69,7 +71,7 @@ $browsers = array(
     'Links' => 'Links',
     'hotjava' => 'HotJava',
     'amaya' => 'Amaya',
-					'IBrowse'			=> 'IBrowse'
+    'IBrowse' => 'IBrowse',
 );
 
 $mobiles = array(
@@ -159,7 +161,7 @@ $mobiles = array(
     'up.link' => "Generic Mobile",
     'up.browser' => "Generic Mobile",
     'smartphone' => "Generic Mobile",
-					'cellphone'				=> "Generic Mobile"
+    'cellphone' => "Generic Mobile",
 );
 
 // There are hundreds of bots but these are the most common.
@@ -171,7 +173,7 @@ $robots = array(
     'askjeeves' => 'AskJeeves',
     'fastcrawler' => 'FastCrawler',
     'infoseek' => 'InfoSeek Robot 1.0',
-					'lycos'				=> 'Lycos'
+    'lycos' => 'Lycos',
 );
 
 /* End of file user_agents.php */

htdocs/application/controllers/Api.php

@@ -1,41 +1,28 @@
-<?php
+<?php if (!defined('BASEPATH')) {
-/**
+    exit('No direct script access allowed');
- * Class and Function List:
+}
- * Function list:
+
- * - __construct()
+include_once 'application/controllers/Main.php';
- * - index()
- * - create()
- * - paste()
- * - random()
- * - recent()
- * - trending()
- * - langs()
- * Classes list:
- * - Api extends Main
- */
-include_once ('application/controllers/Main.php');
 
 class Api extends Main
 {
 
-	function __construct() 
+    public function __construct()
     {
         parent::__construct();
 
-		if (config_item('disable_api')) 
+        if (config_item('disable_api')) {
-		{
             die("The API has been disabled\n");
         }
 
         // if ldap is configured and no api token is configured, fail the request
-        if ((config_item('require_auth') == true) && (config_item('apikey') == ''))
+        if ((config_item('require_auth') == true) && (config_item('apikey') == '')) {
-        {
             die("API key not configured");
         }
 
     }
 
-	function index() 
+    public function index()
     {
         $languages = $this->languages->get_languages();
         $languages = array_keys($languages);
@@ -44,60 +31,47 @@ class Api extends Main
         $this->load->view('api_help', $data);
     }
 
-	function create() 
+    public function create()
     {
 
-		if (config_item('apikey') != $this->input->get('apikey') && config_item('soft_api') == false) 
+        if (config_item('apikey') != $this->input->get('apikey') && config_item('soft_api') == false) {
-		{
             die("Invalid API key\n");
         }
         $this->load->model('pastes');
         $this->load->library('form_validation'); //needed by parent class
 
-		
+        if (!$this->input->post('text')) {
-		if (!$this->input->post('text')) 
-		{
             $data['msg'] = 'Error: Missing paste text';
             $this->load->view('view/api', $data);
-		}
+        } else {
-		else
-		{
 
-			if (!$this->input->post('lang')) 
+            if (!$this->input->post('lang')) {
-			{
                 $_POST['lang'] = 'text';
             }
             $_POST['code'] = $this->input->post('text');
 
-			if ($this->config->item('private_only')) 
+            if ($this->config->item('private_only')) {
-			{
                 $_POST['private'] = 1;
             }
 
             //validations
 
-			if (!$this->_valid_ip()) 
+            if (!$this->_valid_ip()) {
-			{
                 die("You are not allowed to paste\n");
             }
 
-			if (config_item('soft_api') == true && (config_item('apikey') == $this->input->get('apikey'))) 
+            if (config_item('soft_api') == true && (config_item('apikey') == $this->input->get('apikey'))) {
-			{
 
                 //pass
 
-			}
+            } else {
-			else
-			{
 
-				if (!$this->_blockwords_check()) 
+                if (!$this->_blockwords_check()) {
-				{
                     die("Your paste contains blocked words\n");
                 }
             }
 
-			if (!$this->input->post('expire')) 
+            if (!$this->input->post('expire')) {
-			{
                 $_POST['expire'] = config_item('default_expiration');
             }
 
@@ -108,27 +82,22 @@ class Api extends Main
         }
     }
 
-	function paste() 
+    public function paste()
     {
 
-		if (config_item('apikey') != $this->input->get('apikey')) 
+        if (config_item('apikey') != $this->input->get('apikey')) {
-		{
             die("Invalid API key\n");
         }
 
-		if (config_item('private_only')) 
+        if (config_item('private_only')) {
-		{
             show_404();
         }
         $this->load->model('pastes');
         $check = $this->pastes->checkPaste(3);
 
-		if ($check) 
+        if ($check) {
-		{
             $data = $this->pastes->getPaste(3);
-		}
+        } else {
-		else
-		{
             $data = array(
                 'message' => 'Not found',
             );
@@ -136,16 +105,14 @@ class Api extends Main
         echo json_encode($data);
     }
 
-	function random() 
+    public function random()
     {
 
-		if (config_item('apikey') != $this->input->get('apikey')) 
+        if (config_item('apikey') != $this->input->get('apikey')) {
-		{
             die("Invalid API key\n");
         }
 
-		if (config_item('private_only')) 
+        if (config_item('private_only')) {
-		{
             show_404();
         }
         $this->load->model('pastes');
@@ -153,24 +120,21 @@ class Api extends Main
         echo json_encode($data);
     }
 
-	function recent() 
+    public function recent()
     {
 
-		if (config_item('apikey') != $this->input->get('apikey')) 
+        if (config_item('apikey') != $this->input->get('apikey')) {
-		{
             die("Invalid API key\n");
         }
 
-		if (config_item('private_only')) 
+        if (config_item('private_only')) {
-		{
             show_404();
         }
         $this->load->model('pastes');
         $pastes = $this->pastes->getLists('api/recent');
         $pastes = $pastes['pastes'];
         $data = array();
-		foreach ($pastes as $paste) 
+        foreach ($pastes as $paste) {
-		{
             $data[] = array(
                 'pid' => $paste['pid'],
                 'title' => $paste['title'],
@@ -182,24 +146,21 @@ class Api extends Main
         echo json_encode($data);
     }
 
-	function trending() 
+    public function trending()
     {
 
-		if (config_item('apikey') != $this->input->get('apikey')) 
+        if (config_item('apikey') != $this->input->get('apikey')) {
-		{
             die("Invalid API key\n");
         }
 
-		if (config_item('private_only')) 
+        if (config_item('private_only')) {
-		{
             show_404();
         }
         $this->load->model('pastes');
         $pastes = $this->pastes->getTrends('api/trending', 2);
         $pastes = $pastes['pastes'];
         $data = array();
-		foreach ($pastes as $paste) 
+        foreach ($pastes as $paste) {
-		{
             $data[] = array(
                 'pid' => $paste['pid'],
                 'title' => $paste['title'],
@@ -212,10 +173,9 @@ class Api extends Main
         echo json_encode($data);
     }
 
-	function langs() 
+    public function langs()
-	{
-		if (config_item('apikey') != $this->input->get('apikey')) 
     {
+        if (config_item('apikey') != $this->input->get('apikey')) {
             die("Invalid API key\n");
         }
 

htdocs/application/controllers/Auth.php

@@ -1,17 +1,6 @@
-<?php
+<?php if (!defined('BASEPATH')) {
-/**
+    exit('No direct script access allowed');
- * Class and Function List:
+}
- * Function list:
- * - __construct()
- * - index()
- * - login()
- * - logout()
- * - alpha_dash_dot()
- * Classes list:
- * - Auth extends CI_Controller
- */
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 /*
  * This file is part of Auth_Ldap.
@@ -41,7 +30,7 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
 class Auth extends CI_Controller
 {
 
-	function __construct() 
+    public function __construct()
     {
         parent::__construct();
         $this->load->helper('form');
@@ -51,18 +40,17 @@ class Auth extends CI_Controller
         $this->load->library('table');
     }
 
-	function index() 
+    public function index()
     {
         $this->session->keep_flashdata('tried_to');
         $this->login();
     }
 
-	function login($errorMsg = NULL) 
+    public function login($errorMsg = null)
     {
         $this->session->keep_flashdata('tried_to');
 
-		if (!$this->auth_ldap->is_authenticated()) 
+        if (!$this->auth_ldap->is_authenticated()) {
-		{
 
             // Set up rules for form validation
             $rules = $this->form_validation;
@@ -71,56 +59,43 @@ class Auth extends CI_Controller
 
             // Do the login...
 
-			if ($rules->run() && $this->auth_ldap->login($rules->set_value('username') , $rules->set_value('password'))) 
+            if ($rules->run() && $this->auth_ldap->login($rules->set_value('username'), $rules->set_value('password'))) {
-			{
 
                 // Login WIN!
 
-				if ($this->session->flashdata('tried_to')) 
+                if ($this->session->flashdata('tried_to')) {
-				{
                     redirect($this->session->flashdata('tried_to'));
-				}
+                } else {
-				else
-				{
                     redirect('/');
                 }
-			}
+            } else {
-			else
-			{
 
                 // Login FAIL
                 $this->session->set_flashdata('login_error', 'Incorrect username or password.');
                 $this->load->view('auth/login_form');
             }
-		}
+        } else {
-		else
-		{
 
             // Already logged in...
             redirect('/');
         }
     }
 
-	function logout() 
+    public function logout()
     {
 
-		if ($this->session->userdata('logged_in')) 
+        if ($this->session->userdata('logged_in')) {
-		{
             $data['name'] = $this->session->userdata('cn');
             $data['username'] = $this->session->userdata('username');
-			$data['logged_in'] = TRUE;
+            $data['logged_in'] = true;
             $this->auth_ldap->logout();
-		}
+        } else {
-		else
+            $data['logged_in'] = false;
-		{
-			$data['logged_in'] = FALSE;
         }
         redirect('/');
     }
-	public 
+    public function alpha_dash_dot($str)
-	function alpha_dash_dot($str) 
     {
-		return (!preg_match("/^([-a-z0-9_\-\.])+$/i", $str)) ? FALSE : TRUE;
+        return (!preg_match("/^([-a-z0-9_\-\.])+$/i", $str)) ? false : true;
     }
 }
-?>

htdocs/application/controllers/Backup.php

@@ -1,17 +1,11 @@
-<?php
+<?php if (!defined('BASEPATH')) {
-/**
+    exit('No direct script access allowed');
- * Class and Function List:
+}
- * Function list:
- * - __construct()
- * - index()
- * Classes list:
- * - Backup extends CI_Controller
- */
 
 class Backup extends CI_Controller
 {
 
-	function __construct() 
+    public function __construct()
     {
         parent::__construct();
 
@@ -19,15 +13,14 @@ class Backup extends CI_Controller
         $user = $this->config->item('backup_user');
         $pass = $this->config->item('backup_pass');
 
-		if ($user == '' || $pass == '' || !isset($_SERVER['PHP_AUTH_USER']) || $_SERVER['PHP_AUTH_USER'] != $user || $_SERVER['PHP_AUTH_PW'] != $pass) 
+        if ($user == '' || $pass == '' || !isset($_SERVER['PHP_AUTH_USER']) || $_SERVER['PHP_AUTH_USER'] != $user || $_SERVER['PHP_AUTH_PW'] != $pass) {
-		{
             header('WWW-Authenticate: Basic realm="Backup"');
             header('HTTP/1.0 401 Unauthorized');
             exit;
         }
     }
 
-	function index() 
+    public function index()
     {
 
         // Load the DB utility class

htdocs/application/controllers/Iphone.php

@@ -1,31 +1,24 @@
-<?php
+<?php if (!defined('BASEPATH')) {
-/**
+    exit('No direct script access allowed');
- * Class and Function List:
+}
- * Function list:
- * - __construct()
- * - index()
- * - view()
- * Classes list:
- * - Iphone extends CI_Controller
- */
 
 class Iphone extends CI_Controller
 {
 
-	function __construct() 
+    public function __construct()
     {
         parent::__construct();
         $this->load->model('languages');
     }
 
-	function index() 
+    public function index()
     {
         $this->load->model('pastes');
         $data = $this->pastes->getLists('iphone/');
         $this->load->view('iphone/recent', $data);
     }
 
-	function view() 
+    public function view()
     {
         $this->load->model('pastes');
         $data = $this->pastes->getPaste(3);

htdocs/application/controllers/Main.php

@@ -1,50 +1,18 @@
-<?php
+<?php if (!defined('BASEPATH')) {
-/**
+    exit('No direct script access allowed');
- * Class and Function List:
+}
- * Function list:
- * - __construct()
- * - _form_prep()
- * - index()
- * - post_encrypted()
- * - raw()
- * - rss()
- * - embed()
- * - qr()
- * - download()
- * - lists()
- * - trends()
- * - view()
- * - cron()
- * - about()
- * - captcha()
- * - _valid_lang()
- * - _valid_captcha()
- * - _valid_recaptcha()
- * - _valid_ip()
- * - _valid_ipv4()
- * - _valid_ipv6()
- * - _blockwords_check()
- * - _autofill_check()
- * - _valid_authentication()
- * - get_cm_js()
- * - error_404()
- * - robots_txt()
- * Classes list:
- * - Main extends CI_Controller
- */
 
 class Main extends CI_Controller
 {
 
-	function __construct() 
+    public function __construct()
     {
         parent::__construct();
         $this->output->enable_profiler(false);
         $this->load->model('languages');
         $this->load->library('curl');
 
-		if (config_item('require_auth')) 
+        if (config_item('require_auth')) {
-		{
             $this->load->library('auth_ldap');
         }
 
@@ -53,18 +21,15 @@ class Main extends CI_Controller
         $this->recaptcha_privatekey = config_item('recaptcha_privatekey');
         $this->use_recaptcha = false;
 
-		if ($this->recaptcha_publickey != '' && $this->recaptcha_privatekey != '') 
+        if ($this->recaptcha_publickey != '' && $this->recaptcha_privatekey != '') {
-		{
             $this->load->helper('recaptcha');
             $this->use_recaptcha = true;
         }
 
-		if (!$this->db->table_exists('sessions')) 
+        if (!$this->db->table_exists('sessions')) {
-		{
             $this->load->dbforge();
 
-			if ($this->db->table_exists('ci_sessions')) 
+            if ($this->db->table_exists('ci_sessions')) {
-			{
                 $this->dbforge->drop_table('ci_sessions');
             }
             $fields = array(
@@ -81,7 +46,7 @@ class Main extends CI_Controller
                 'timestamp' => array(
                     'type' => 'INT',
                     'constraint' => 10,
-					'unsigned' => TRUE,
+                    'unsigned' => true,
                     'default' => 0,
                 ),
                 'data' => array(
@@ -97,14 +62,13 @@ class Main extends CI_Controller
         // load this after db has been initialized
         $this->load->library('session');
 
-		if (!$this->db->table_exists('pastes')) 
+        if (!$this->db->table_exists('pastes')) {
-		{
             $this->load->dbforge();
             $fields = array(
                 'id' => array(
                     'type' => 'INT',
                     'constraint' => 10,
-					'auto_increment' => TRUE,
+                    'auto_increment' => true,
                 ),
                 'pid' => array(
                     'type' => 'VARCHAR',
@@ -141,7 +105,7 @@ class Main extends CI_Controller
                 'toexpire' => array(
                     'type' => 'TINYINT',
                     'constraint' => 1,
-					'unsigned' => TRUE,
+                    'unsigned' => true,
                     'default' => 0,
                 ),
                 'snipurl' => array(
@@ -156,7 +120,7 @@ class Main extends CI_Controller
                 'ip_address' => array(
                     'type' => 'VARCHAR',
                     'constraint' => 45,
-					'null' => TRUE,
+                    'null' => true,
                 ),
                 'hits' => array(
                     'type' => 'INT',
@@ -181,8 +145,7 @@ class Main extends CI_Controller
             $this->dbforge->create_table('pastes', true);
         }
 
-		if (!$this->db->table_exists('blocked_ips')) 
+        if (!$this->db->table_exists('blocked_ips')) {
-		{
             $this->load->dbforge();
             $fields = array(
                 'ip_address' => array(
@@ -205,8 +168,7 @@ class Main extends CI_Controller
             $this->dbforge->create_table('blocked_ips', true);
         }
 
-		if (!$this->db->table_exists('trending')) 
+        if (!$this->db->table_exists('trending')) {
-		{
             $this->load->dbforge();
             $fields = array(
                 'paste_id' => array(
@@ -230,21 +192,19 @@ class Main extends CI_Controller
             $this->dbforge->create_table('trending', true);
         }
 
-		if (!$this->db->field_exists('ip_address', 'pastes')) 
+        if (!$this->db->field_exists('ip_address', 'pastes')) {
-		{
             $this->load->dbforge();
             $fields = array(
                 'ip_address' => array(
                     'type' => 'VARCHAR',
                     'constraint' => 45,
-					'null' => TRUE,
+                    'null' => true,
                 ),
             );
             $this->dbforge->add_column('pastes', $fields);
         }
 
-		if (!$this->db->field_exists('hits', 'pastes')) 
+        if (!$this->db->field_exists('hits', 'pastes')) {
-		{
             $this->load->dbforge();
             $fields = array(
                 'hits' => array(
@@ -266,19 +226,15 @@ class Main extends CI_Controller
         //ipv6 migration
         $fields = $this->db->field_data('trending');
 
-		if (stristr(config_item('db_driver') , 'sqlite') === false && $fields[1]->max_length < 45) 
+        if (stristr(config_item('db_driver'), 'sqlite') === false && $fields[1]->max_length < 45) {
-		{
             $db_prefix = config_item('db_prefix');
 
-			if ($this->db->dbdriver == "postgre") 
+            if ($this->db->dbdriver == "postgre") {
-			{
                 $this->db->query("ALTER TABLE " . $db_prefix . "trending ALTER COLUMN ip_address TYPE VARCHAR(45), ALTER COLUMN ip_address SET NOT NULL, ALTER COLUMN ip_address SET DEFAULT '0'");
                 $this->db->query("ALTER TABLE " . $db_prefix . "pastes ALTER COLUMN ip_address TYPE VARCHAR(45), ALTER COLUMN ip_address SET NOT NULL, ALTER COLUMN ip_address SET DEFAULT '0'");
                 $this->db->query("ALTER TABLE " . $db_prefix . "blocked_ips ALTER COLUMN ip_address TYPE VARCHAR(45), ALTER COLUMN ip_address SET NOT NULL, ALTER COLUMN ip_address SET DEFAULT '0'");
                 $this->db->query("ALTER TABLE " . $db_prefix . "sessions ALTER COLUMN ip_address TYPE VARCHAR(45), ALTER COLUMN ip_address SET NOT NULL, ALTER COLUMN ip_address SET DEFAULT '0'");
-			}
+            } else {
-			else
-			{
                 $this->db->query("ALTER TABLE " . $db_prefix . "trending CHANGE COLUMN ip_address ip_address VARCHAR(45) NOT NULL DEFAULT '0'");
                 $this->db->query("ALTER TABLE " . $db_prefix . "pastes CHANGE COLUMN ip_address ip_address VARCHAR(45) NOT NULL DEFAULT '0'");
                 $this->db->query("ALTER TABLE " . $db_prefix . "blocked_ips CHANGE COLUMN ip_address ip_address VARCHAR(45) NOT NULL DEFAULT '0'");
@@ -288,22 +244,16 @@ class Main extends CI_Controller
 
         //expand title to 50
         $fields = $this->db->field_data('pastes');
-		foreach ($fields as $field) 
+        foreach ($fields as $field) {
-		{
 
-			if ($field->name == 'title') 
+            if ($field->name == 'title') {
-			{
 
-				if (stristr(config_item('db_driver') , 'sqlite') === false && $field->max_length < 50) 
+                if (stristr(config_item('db_driver'), 'sqlite') === false && $field->max_length < 50) {
-				{
                     $db_prefix = config_item('db_prefix');
 
-					if ($this->db->dbdriver == "postgre") 
+                    if ($this->db->dbdriver == "postgre") {
-					{
                         $this->db->query("ALTER TABLE " . $db_prefix . "pastes ALTER COLUMN title TYPE VARCHAR(50), ALTER COLUMN title SET NOT NULL");
-					}
+                    } else {
-					else
-					{
                         $this->db->query("ALTER TABLE " . $db_prefix . "pastes CHANGE COLUMN title title VARCHAR(50) NOT NULL");
                     }
                 }
@@ -312,25 +262,18 @@ class Main extends CI_Controller
 
         //upgrade to CI 3.1.2
         $fields = $this->db->field_data('sessions');
-		foreach ($fields as $field) 
+        foreach ($fields as $field) {
-		{
 
-			if ($field->name == 'id') 
+            if ($field->name == 'id') {
-			{
 
-				if (stristr(config_item('db_driver') , 'sqlite') === false) 
+                if (stristr(config_item('db_driver'), 'sqlite') === false) {
-				{
 
-					if ($field->max_length < 128) 
+                    if ($field->max_length < 128) {
-					{
                         $db_prefix = config_item('db_prefix');
 
-						if ($this->db->dbdriver == "postgre") 
+                        if ($this->db->dbdriver == "postgre") {
-						{
                             $this->db->query("ALTER TABLE " . $db_prefix . "sessions ALTER COLUMN id SET DATA TYPE varchar(128)");
-						}
+                        } else {
-						else
-						{
                             $this->db->query("ALTER TABLE " . $db_prefix . "sessions CHANGE id id VARCHAR(128) NOT NULL");
                         }
                     }
@@ -339,14 +282,13 @@ class Main extends CI_Controller
         }
     }
 
-	function _form_prep($lang = false, $title = '', $paste = '', $reply = false) 
+    public function _form_prep($lang = false, $title = '', $paste = '', $reply = false)
     {
         $this->load->model('languages');
         $this->load->helper('form');
         $data['languages'] = $this->languages->get_languages();
 
-		if (config_item('js_editor') == 'codemirror') 
+        if (config_item('js_editor') == 'codemirror') {
-		{
 
             //codemirror languages
             $this->load->config('codemirror_languages');
@@ -355,19 +297,16 @@ class Main extends CI_Controller
 
             //codemirror modes
             $cmm = array();
-			foreach ($codemirror_languages as $geshi_name => $l) 
+            foreach ($codemirror_languages as $geshi_name => $l) {
-			{
 
-				if (gettype($l) == 'array') 
+                if (gettype($l) == 'array') {
-				{
                     $cmm[$geshi_name] = $l['mode'];
                 }
             }
             $data['codemirror_modes'] = $cmm;
         }
 
-		if (config_item('js_editor') == 'ace') 
+        if (config_item('js_editor') == 'ace') {
-		{
 
             //ace languages
             $this->load->config('ace_languages');
@@ -376,8 +315,7 @@ class Main extends CI_Controller
 
             //ace modes
             $acem = array();
-			foreach ($ace_languages as $geshi_name => $l) 
+            foreach ($ace_languages as $geshi_name => $l) {
-			{
                 $acem[$geshi_name] = $l;
             }
             $data['ace_modes'] = $acem;
@@ -387,23 +325,19 @@ class Main extends CI_Controller
         $data['use_recaptcha'] = $this->use_recaptcha;
         $data['recaptcha_publickey'] = $this->recaptcha_publickey;
 
-		if (!$this->input->post('submit')) 
+        if (!$this->input->post('submit')) {
-		{
 
-			if (!$this->session->userdata('expire')) 
+            if (!$this->session->userdata('expire')) {
-			{
                 $default_expiration = config_item('default_expiration');
                 $this->session->set_userdata('expire', $default_expiration);
             }
 
-			if (!$this->session->userdata('snipurl')) 
+            if (!$this->session->userdata('snipurl')) {
-			{
                 $shorturl_selected = config_item('shorturl_selected');
                 $this->session->set_userdata('snipurl', $shorturl_selected);
             }
 
-			if ($this->session->flashdata('settings_changed')) 
+            if ($this->session->flashdata('settings_changed')) {
-			{
                 $data['status_message'] = 'Settings successfully changed';
             }
             $data['name_set'] = $this->session->userdata('name');
@@ -414,14 +348,11 @@ class Main extends CI_Controller
             $data['title_set'] = $title;
             $data['reply'] = $reply;
 
-			if (!$lang) 
+            if (!$lang) {
-			{
                 $lang = config_item('default_language');
             }
             $data['lang_set'] = $lang;
-		}
+        } else {
-		else
-		{
             $data['name_set'] = $this->input->post('name');
             $data['expire_set'] = $this->input->post('expire');
             $data['private_set'] = $this->input->post('private');
@@ -434,19 +365,16 @@ class Main extends CI_Controller
         return $data;
     }
 
-	function index() 
+    public function index()
     {
         $this->_valid_authentication();
         $this->load->helper('json');
 
-		if (!$this->input->post('submit')) 
+        if (!$this->input->post('submit')) {
-		{
             $data = $this->_form_prep();
             $this->content_expiration(config_item('content_expiration'));
             $this->load->view('home', $data);
-		}
+        } else {
-		else
-		{
             $this->load->model('pastes');
             $this->load->library('form_validation');
 
@@ -489,26 +417,20 @@ class Main extends CI_Controller
             $this->form_validation->set_message('min_length', lang('empty'));
             $this->form_validation->set_error_delimiters('<div class="message error"><div class="container">', '</div></div>');
 
-			if ($this->form_validation->run() == FALSE) 
+            if ($this->form_validation->run() == false) {
-			{
                 $data = $this->_form_prep();
                 $this->load->view('home', $data);
-			}
+            } else {
-			else
-			{
 
-				if (config_item('private_only')) 
+                if (config_item('private_only')) {
-				{
                     $_POST['private'] = 1;
                 }
 
-				if (config_item('disable_shorturl')) 
+                if (config_item('disable_shorturl')) {
-				{
                     $_POST['snipurl'] = 0;
                 }
 
-				if ($this->input->post('reply') == false) 
+                if ($this->input->post('reply') == false) {
-				{
                     $user_data = array(
                         'name' => $this->input->post('name'),
                         'lang' => $this->input->post('lang'),
@@ -523,131 +445,111 @@ class Main extends CI_Controller
         }
     }
 
-	function post_encrypted() 
+    public function post_encrypted()
     {
         $this->_valid_authentication();
 
-		if ($this->_valid_captcha($this->input->post('captcha'))) 
+        if ($this->_valid_captcha($this->input->post('captcha'))) {
-		{
             $this->load->model('pastes');
             $_POST['private'] = 1;
             $_POST['snipurl'] = 0;
             $ret_url = $this->pastes->createPaste();
             echo $ret_url;
-		}
+        } else {
-		else
-		{
             echo 'E_CAPTCHA';
         }
     }
 
-	function raw() 
+    public function raw()
     {
         $this->_valid_authentication();
         $this->load->model('pastes');
         $check = $this->pastes->checkPaste(3);
 
-		if ($check) 
+        if ($check) {
-		{
             $data = $this->pastes->getPaste(3);
 
-			if (isset($_GET['preview'])) 
+            if (isset($_GET['preview'])) {
-			{
                 $this->load->helper('text');
                 $data['raw'] = character_limiter($data['raw'], 500);
+                $data['raw'] = htmlspecialchars($data['raw']);
             }
             $this->content_expiration(config_item('content_expiration'));
             $this->load->view('view/raw', $data);
-		}
+        } else {
-		else
-		{
             show_404();
         }
     }
 
-	function rss() 
+    public function rss()
     {
         $this->_valid_authentication();
         $this->load->model('pastes');
         $check = $this->pastes->checkPaste(3);
 
-		if ($check) 
+        if ($check) {
-		{
             $this->load->helper('text');
             $paste = $this->pastes->getPaste(3);
             $data = $this->pastes->getReplies(3);
             $data['page_title'] = $paste['title'] . ' - ' . config_item('site_name');
             $data['feed_url'] = site_url('view/rss/' . $this->uri->segment(3));
             $this->load->view('view/rss', $data);
-		}
+        } else {
-		else
-		{
             show_404();
         }
     }
 
-	function embed() 
+    public function embed()
     {
         $this->_valid_authentication();
         $this->load->model('pastes');
         $check = $this->pastes->checkPaste(3);
 
-		if ($check) 
+        if ($check) {
-		{
             $data = $this->pastes->getPaste(3, true, $this->uri->segment(4) == 'diff');
             $this->content_expiration(config_item('content_expiration'));
             $this->load->view('view/embed', $data);
-		}
+        } else {
-		else
-		{
             show_404();
         }
     }
 
-	function qr() 
+    public function qr()
     {
         $this->load->model('pastes');
         $check = $this->pastes->checkPaste(3);
 
-		if ($check) 
+        if ($check) {
-		{
             $data = $this->pastes->getPaste(3);
             $this->content_expiration('+1 year');
             $this->load->view('view/qr', $data);
         }
     }
 
-	function download() 
+    public function download()
     {
         $this->_valid_authentication();
         $this->load->model('pastes');
         $check = $this->pastes->checkPaste(3);
 
-		if ($check) 
+        if ($check) {
-		{
             $data = $this->pastes->getPaste(3);
             $this->load->view('view/download', $data);
-		}
+        } else {
-		else
-		{
             show_404();
         }
     }
 
-	function lists() 
+    public function lists()
     {
         $this->_valid_authentication();
 
-		if (config_item('private_only')) 
+        if (config_item('private_only')) {
-		{
             show_404();
-		}
+        } else {
-		else
-		{
             $this->load->model('pastes');
 
-			if ($this->uri->segment(2) == 'rss') 
+            if ($this->uri->segment(2) == 'rss') {
-			{
                 $this->load->helper('text');
                 $data = $this->pastes->getLists('lists/', 3);
                 $data['page_title'] = config_item('site_name');
@@ -655,167 +557,138 @@ class Main extends CI_Controller
                 $data['replies'] = $data['pastes'];
                 unset($data['pastes']);
                 $this->load->view('view/rss', $data);
-			}
+            } else {
-			else
-			{
                 $data = $this->pastes->getLists('lists/', 2);
                 $this->load->view('list', $data);
             }
         }
     }
 
-	function trends() 
+    public function trends()
     {
         $this->_valid_authentication();
 
-		if (config_item('private_only')) 
+        if (config_item('private_only')) {
-		{
             show_404();
-		}
+        } else {
-		else
-		{
             $this->load->model('pastes');
             $data = $this->pastes->getTrends();
             $this->load->view('trends', $data);
         }
     }
 
-	function view() 
+    public function view()
     {
         $this->_valid_authentication();
         $this->load->helper('json');
         $this->load->model('pastes');
         $check = $this->pastes->checkPaste(2);
 
-		if ($check) 
+        if ($check) {
-		{
 
-			if ($this->session->userdata('view_raw')) 
+            if ($this->session->userdata('view_raw')) {
-			{
                 redirect('view/raw/' . $this->uri->segment(2));
             }
             $data = $this->pastes->getPaste(2, true, $this->uri->segment(3) == 'diff');
             $data['reply_form'] = $this->_form_prep($data['lang_code'], 'Re: ' . $data['title'], $data['raw'], $data['pid']);
 
-			if ($data['private'] == 1) 
+            if ($data['private'] == 1) {
-			{
                 $data['reply_form']['use_recaptcha'] = $this->use_recaptcha;
             }
             $this->content_expiration(config_item('content_expiration'));
             $this->load->view('view/view', $data);
-		}
+        } else {
-		else
-		{
             show_404();
         }
     }
 
-	function cron() 
+    public function cron()
     {
         $this->load->model('pastes');
         $key = $this->uri->segment(2);
 
-		if ($key != config_item('cron_key')) 
+        if ($key != config_item('cron_key')) {
-		{
             show_404();
-		}
+        } else {
-		else
-		{
             $this->pastes->cron();
             return 0;
         }
     }
 
-	function about() 
+    public function about()
     {
         $this->load->view('about');
     }
 
-	function captcha() 
+    public function captcha()
     {
         $this->load->helper('captcha');
 
         //get "word"
         $pool = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ@';
         $str = '';
-		for ($i = 0;$i < 8;$i++) 
+        for ($i = 0; $i < 8; $i++) {
-		{
             $str .= substr($pool, mt_rand(0, strlen($pool) - 1), 1);
         }
         $word = $str;
 
         //save
         $this->session->set_userdata(array(
-			'captcha' => $word
+            'captcha' => $word,
         ));
 
         //view
         $this->load->view('view/captcha', array(
-			'word' => $word
+            'word' => $word,
         ));
     }
 
-	function _valid_lang($lang) 
+    public function _valid_lang($lang)
     {
         $this->load->model('languages');
         $this->form_validation->set_message('_valid_lang', lang('valid_lang'));
         return $this->languages->valid_language($lang);
     }
 
-	function _valid_captcha($text) 
+    public function _valid_captcha($text)
     {
 
-		if (config_item('enable_captcha') && $this->session->userdata('is_human') === null) 
+        if (config_item('enable_captcha') && $this->session->userdata('is_human') === null) {
-		{
 
-			if (isset($this->form_validation)) 
+            if (isset($this->form_validation)) {
-			{
                 $this->form_validation->set_message('_valid_captcha', lang('captcha'));
             }
 
-			if ($this->use_recaptcha) 
+            if ($this->use_recaptcha) {
-			{
 
-				if ($this->_valid_recaptcha()) 
+                if ($this->_valid_recaptcha()) {
-				{
                     $this->session->set_userdata('is_human', true);
                     return true;
+                } else {
+                    return false;
                 }
-				else
+            } else {
-				{
+
+                if ($text && strtolower($text) == strtolower($this->session->userdata('captcha'))) {
+                    $this->session->set_userdata('is_human', true);
+                    return true;
+                } else {
                     return false;
                 }
             }
-			else
+        } else {
-			{
-				
-				if (strtolower($text) == strtolower($this->session->userdata('captcha'))) 
-				{
-					$this->session->set_userdata('is_human', true);
-					return true;
-				}
-				else
-				{
-					return false;
-				}
-			}
-		}
-		else
-		{
             return true;
         }
     }
 
-	function _valid_recaptcha() 
+    public function _valid_recaptcha()
     {
 
-		if ($this->recaptcha_privatekey == null || $this->recaptcha_privatekey == '') 
+        if ($this->recaptcha_privatekey == null || $this->recaptcha_privatekey == '') {
-		{
             die("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
         }
 
-		if ($this->input->post('g-recaptcha-response')) 
+        if ($this->input->post('g-recaptcha-response')) {
-		{
             $pk = $this->recaptcha_privatekey;
             $ra = $_SERVER['REMOTE_ADDR'];
             $rf = trim($this->input->post('g-recaptcha-response'));
@@ -824,39 +697,31 @@ class Main extends CI_Controller
             $status = json_decode($response, true);
             $recaptcha_response = new stdClass();
 
-			if ($status['success']) 
+            if ($status['success']) {
-			{
                 $recaptcha_response->is_valid = true;
-			}
+            } else {
-			else
-			{
                 $recaptcha_response->is_valid = false;
             }
             return $recaptcha_response;
-		}
+        } else {
-		else
-		{
             return false;
         }
     }
 
-	function _valid_ip() 
+    public function _valid_ip()
     {
 
         //get ip
         $ip_address = $this->input->ip_address();
 
-		if (stristr($ip_address, ':')) 
+        if (stristr($ip_address, ':')) {
-		{
             return $this->_valid_ipv6($ip_address);
-		}
+        } else {
-		else
-		{
             return $this->_valid_ipv4($ip_address);
         }
     }
 
-	function _valid_ipv4($ip_address) 
+    public function _valid_ipv4($ip_address)
     {
 
         //get ip range
@@ -873,8 +738,7 @@ class Main extends CI_Controller
 
         //check
 
-		if ($query->num_rows() > 0) 
+        if ($query->num_rows() > 0) {
-		{
 
             //update spamcount
             $blocked_ips = $query->result_array();
@@ -886,14 +750,12 @@ class Main extends CI_Controller
 
             //return for the validation
             return false;
-		}
+        } else {
-		else
-		{
             return true;
         }
     }
 
-	function _valid_ipv6($ip_address) 
+    public function _valid_ipv6($ip_address)
     {
 
         //setup message
@@ -906,8 +768,7 @@ class Main extends CI_Controller
 
         //check
 
-		if ($query->num_rows() > 0) 
+        if ($query->num_rows() > 0) {
-		{
 
             //update spamcount
             $blocked_ips = $query->result_array();
@@ -919,14 +780,12 @@ class Main extends CI_Controller
 
             //return for the validation
             return false;
-		}
+        } else {
-		else
-		{
             return true;
         }
     }
 
-	function _blockwords_check() 
+    public function _blockwords_check()
     {
 
         //setup message
@@ -935,27 +794,23 @@ class Main extends CI_Controller
         //check
         $blocked_words = config_item('blocked_words');
         $post = $this->input->post();
-		$raw = $post['code'];
 
-		if (!$blocked_words) 
+        if (!$blocked_words) {
-		{
             return true;
         }
 
         //we have blocked words
-		foreach (explode(',', $blocked_words) as $word) 
+        foreach (explode(',', $blocked_words) as $word) {
-		{
             $word = trim($word);
 
-			if (stristr($raw, $word)) 
+            if (stristr($post['code'], $word) || stristr($post['title'], $word)) {
-			{
                 return false;
             }
         }
         return true;
     }
 
-	function _autofill_check() 
+    public function _autofill_check()
     {
 
         //setup message
@@ -965,21 +820,19 @@ class Main extends CI_Controller
         return (!$this->input->post('email') && !$this->input->post('url'));
     }
 
-	function _valid_authentication() 
+    public function _valid_authentication()
     {
 
-		if (config_item('require_auth')) 
+        if (config_item('require_auth')) {
-		{
 
-			if (!$this->auth_ldap->is_authenticated()) 
+            if (!$this->auth_ldap->is_authenticated()) {
-			{
                 $this->session->set_flashdata('tried_to', "/" . $this->uri->uri_string());
                 redirect('/auth');
             }
         }
     }
 
-	function get_cm_js() 
+    public function get_cm_js()
     {
         $lang = $this->uri->segment(3);
         $this->load->config('codemirror_languages');
@@ -988,46 +841,39 @@ class Main extends CI_Controller
         //file path
         $file_path = 'themes/' . config_item('theme') . '/js/';
 
-		if (!file_exists($file_path)) 
+        if (!file_exists($file_path)) {
-		{
             $file_path = 'themes/default/js/';
         }
 
-		if (isset($cml[$lang]) && gettype($cml[$lang]) == 'array') 
+        if (isset($cml[$lang]) && gettype($cml[$lang]) == 'array') {
-		{
             header('Content-Type: application/x-javascript; charset=utf-8');
             header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + 60 * 60 * 24 * 30));
-			foreach ($cml[$lang]['js'] as $js) 
+            foreach ($cml[$lang]['js'] as $js) {
-			{
                 echo file_get_contents($file_path . $js[0]);
             }
         }
         exit;
     }
 
-	function error_404() 
+    public function error_404()
     {
         show_404();
     }
 
-	function robots_txt() 
+    public function robots_txt()
     {
 
-		if (config_item('disallow_search_engines')) 
+        if (config_item('disallow_search_engines')) {
-		{
             header('Content-Type: text/plain; charset=utf-8');
             $this->load->view('robots_txt');
-		}
+        } else {
-		else
-		{
             echo '';
         }
     }
 
-	function content_expiration($cache_time)
+    public function content_expiration($cache_time)
-	{
-		if(!$cache_time)
     {
+        if (!$cache_time) {
             $cache_time = '-1 week';
         }
         $cache_expiration = strtotime($cache_time);

htdocs/application/controllers/Spamadmin.php

@@ -1,20 +1,11 @@
-<?php
+<?php if (!defined('BASEPATH')) {
-/**
+    exit('No direct script access allowed');
- * Class and Function List:
+}
- * Function list:
- * - __construct()
- * - index()
- * - spam_detail()
- * - blacklist()
- * - unblock_ip()
- * Classes list:
- * - Spamadmin extends CI_Controller
- */
 
 class Spamadmin extends CI_Controller
 {
 
-	function __construct() 
+    public function __construct()
     {
         parent::__construct();
 
@@ -31,32 +22,27 @@ class Spamadmin extends CI_Controller
 
         // If they're not set, set them to blank. The null coalesce operator would be handy here, but
         // that's PHP 7.0 and higher...
-		if (empty($_SERVER['PHP_AUTH_USER']))
+        if (empty($_SERVER['PHP_AUTH_USER'])) {
-		{
             $_SERVER['PHP_AUTH_USER'] = "";
         }
-		if (empty($_SERVER['PHP_AUTH_PW']))
+        if (empty($_SERVER['PHP_AUTH_PW'])) {
-		{
             $_SERVER['PHP_AUTH_PW'] = "";
         }
 
-		if ($user === '' || $pass === '' || $_SERVER['PHP_AUTH_USER'] !== $user || $_SERVER['PHP_AUTH_PW'] !== $pass) 
+        if ($user === '' || $pass === '' || $_SERVER['PHP_AUTH_USER'] !== $user || $_SERVER['PHP_AUTH_PW'] !== $pass) {
-		{
             header('WWW-Authenticate: Basic realm="Spamadmin"');
             header('HTTP/1.0 401 Unauthorized');
             exit;
         }
     }
 
-	function index() 
+    public function index()
     {
         $this->load->model('pastes');
         $pastes_to_delete = $this->input->post('pastes_to_delete');
 
-		if ($pastes_to_delete) 
+        if ($pastes_to_delete) {
-		{
+            foreach (explode(' ', $pastes_to_delete) as $pid) {
-			foreach (explode(' ', $pastes_to_delete) as $pid) 
-			{
                 $this->db->where('pid', $pid);
                 $this->db->delete('pastes');
             }
@@ -68,25 +54,22 @@ class Spamadmin extends CI_Controller
         $this->load->view('list_ips', $data);
     }
 
-	function spam_detail() 
+    public function spam_detail()
     {
         $this->load->model('pastes');
         $ip_address = $this->uri->segment(2);
 
-		if ($this->input->post('confirm_remove') && $ip_address != '') 
+        if ($this->input->post('confirm_remove') && $ip_address != '') {
-		{
             $this->db->where('ip_address', $ip_address);
             $this->db->delete('pastes');
             $paste_count = $this->db->affected_rows();
 
-			if ($this->input->post('block_ip')) 
+            if ($this->input->post('block_ip')) {
-			{
                 $query = $this->db->get_where('blocked_ips', array(
-					'ip_address' => $ip_address
+                    'ip_address' => $ip_address,
                 ));
 
-				if ($query->num_rows() == 0) 
+                if ($query->num_rows() == 0) {
-				{
                     $this->db->insert('blocked_ips', array(
                         'ip_address' => $ip_address,
                         'blocked_at' => time(),
@@ -101,13 +84,10 @@ class Spamadmin extends CI_Controller
         $data['ip_address'] = $ip_address;
         $ip = explode('.', $ip_address);
 
-		if (count($ip) > 1) 
+        if (count($ip) > 1) {
-		{
             $ip_firstpart = $ip[0] . '.' . $ip[1] . '.';
             $data['ip_range'] = $ip_firstpart . '*.*';
-		}
+        } else {
-		else
-		{
 
             // ipv6
             $ip = explode(':', $ip_address);
@@ -119,7 +99,7 @@ class Spamadmin extends CI_Controller
         $this->load->view('spam_detail', $data);
     }
 
-	function blacklist() 
+    public function blacklist()
     {
 
         //pagination
@@ -149,7 +129,7 @@ class Spamadmin extends CI_Controller
         $this->load->view('list_blocked_ips', $data);
     }
 
-	function unblock_ip() 
+    public function unblock_ip()
     {
         $ip_address = $this->uri->segment(4);
         $this->db->where('ip_address', $ip_address);

htdocs/application/controllers/Theme_assets.php

@@ -1,73 +1,53 @@
-<?php
+<?php if (!defined('BASEPATH')) {
-/**
+    exit('No direct script access allowed');
- * Class and Function List:
+}
- * Function list:
- * - __construct()
- * - css()
- * - fonts()
- * - images()
- * - js()
- * - _expires_header()
- * Classes list:
- * - Theme_assets extends CI_Controller
- */
 
 class Theme_assets extends CI_Controller
 {
-	
+    public function __construct()
-	function __construct() 
     {
         parent::__construct();
         $this->theme = config_item('theme');
     }
 
-	function css() 
+    public function css()
     {
         $css_file = $this->uri->segment(4);
         $css_file = basename($css_file); // Fix LFI Vulnerability
 
-		
+        if ($css_file == 'fonts') {
-		if ($css_file == 'fonts') 
-		{
             $font_file = $this->uri->segment(5);
             $font_file = basename($font_file);
 
             //file path
             $file_path = 'themes/' . $this->theme . '/css/fonts/' . $font_file;
 
-			if (!file_exists($file_path)) 
+            if (!file_exists($file_path)) {
-			{
                 return false;
             }
             $path_parts = pathinfo(dirname(dirname(dirname(__FILE__))) . '/' . $file_path);
 
-			if ($path_parts['extension'] == "woff") 
+            if ($path_parts['extension'] == "woff") {
-			{
                 header('Content-type: application/font-woff');
             }
 
-			if ($path_parts['extension'] == "eot") 
+            if ($path_parts['extension'] == "eot") {
-			{
                 header('Content-type: application/vnd.ms-fontobject');
             }
 
-			if ($path_parts['extension'] == "ttf" || $path_parts['extension'] == "ttc") 
+            if ($path_parts['extension'] == "ttf" || $path_parts['extension'] == "ttc") {
-			{
                 header('Content-type: application/x-font-ttf');
             }
 
-			if ($path_parts['extension'] == "otf") 
+            if ($path_parts['extension'] == "otf") {
-			{
                 header('Content-type: font/opentype');
             }
 
-			if ($path_parts['extension'] == "svg") 
+            if ($path_parts['extension'] == "svg") {
-			{
                 header('Content-type: image/svg+xml');
             }
 
-			if ($path_parts['extension'] == "svgz") 
+            if ($path_parts['extension'] == "svgz") {
-			{
                 header("Content-Encoding: gzip");
                 header('Content-type: image/svg+xml');
             }
@@ -75,24 +55,21 @@ class Theme_assets extends CI_Controller
             //send
             $this->_expires_header(1);
             readfile($file_path);
-		}
+
-		else
+        } else {
-		{
 
             //file path
             $file_path = 'themes/' . $this->theme . '/css/' . $css_file;
 
             //fallback to default css if view in theme not found
 
-			if (!file_exists($file_path)) 
+            if (!file_exists($file_path)) {
-			{
                 $file_path = 'themes/default/css/' . $css_file;
             }
 
             // Double checking file
 
-			if (!file_exists($file_path)) 
+            if (!file_exists($file_path)) {
-			{
                 return false;
             }
 
@@ -103,7 +80,7 @@ class Theme_assets extends CI_Controller
         }
     }
 
-	function fonts() 
+    public function fonts()
     {
         $font_file = $this->uri->segment(4);
 
@@ -112,43 +89,34 @@ class Theme_assets extends CI_Controller
 
         //no fallback to default, since default has no such fonts
         //since no fallbcack, there is no doucle checking for file
-
+        if (!file_exists($file_path)) {
-		
-		if (!file_exists($file_path)) 
-		{
             return false;
         }
 
         //send
         $path_parts = pathinfo(dirname(dirname(dirname(__FILE__))) . '/' . $file_path);
 
-		if ($path_parts['extension'] == "woff") 
+        if ($path_parts['extension'] == "woff") {
-		{
             header('Content-type: application/font-woff');
         }
 
-		if ($path_parts['extension'] == "eot") 
+        if ($path_parts['extension'] == "eot") {
-		{
             header('Content-type: application/vnd.ms-fontobject');
         }
 
-		if ($path_parts['extension'] == "ttf" || $path_parts['extension'] == "ttc") 
+        if ($path_parts['extension'] == "ttf" || $path_parts['extension'] == "ttc") {
-		{
             header('Content-type: application/x-font-ttf');
         }
 
-		if ($path_parts['extension'] == "otf") 
+        if ($path_parts['extension'] == "otf") {
-		{
             header('Content-type: font/opentype');
         }
 
-		if ($path_parts['extension'] == "svg") 
+        if ($path_parts['extension'] == "svg") {
-		{
             header('Content-type: image/svg+xml');
         }
 
-		if ($path_parts['extension'] == "svgz") 
+        if ($path_parts['extension'] == "svgz") {
-		{
             header("Content-Encoding: gzip");
             header('Content-type: image/svg+xml');
         }
@@ -156,7 +124,7 @@ class Theme_assets extends CI_Controller
         readfile($file_path);
     }
 
-	function images() 
+    public function images()
     {
         $image_file = $this->uri->segment(4);
         $image_file = basename($image_file);
@@ -165,16 +133,12 @@ class Theme_assets extends CI_Controller
         $file_path = 'themes/' . $this->theme . '/images/' . $image_file;
 
         //fallback to default css if view in theme not found
-		
+        if (!file_exists($file_path)) {
-		if (!file_exists($file_path)) 
-		{
             $file_path = 'themes/default/images/' . $image_file;
         }
 
         // double checking file
-		
+        if (!file_exists($file_path)) {
-		if (!file_exists($file_path)) 
-		{
             return false;
         }
 
@@ -185,9 +149,8 @@ class Theme_assets extends CI_Controller
         readfile($file_path);
     }
 
-	function js() 
+    public function js()
     {
-
         //get js
         $segments = $this->uri->segment_array();
         array_shift($segments);
@@ -200,16 +163,12 @@ class Theme_assets extends CI_Controller
         $file_path = 'themes/' . $this->theme . '/js/' . $js_file;
 
         //fallback to default js if js in theme not found
-		
+        if (!file_exists($file_path)) {
-		if (!file_exists($file_path)) 
-		{
             $file_path = 'themes/default/js/' . $js_file;
         }
 
         // return empty string if not found, to not mess up existing JS
-		
+        if (!file_exists($file_path)) {
-		if (!file_exists($file_path)) 
-		{
             header('HTTP/1.1 404 Not Found');
             return '';
         }
@@ -219,8 +178,8 @@ class Theme_assets extends CI_Controller
         $this->_expires_header(30);
         readfile($file_path);
     }
-	private 
+
-	function _expires_header($days) 
+    private function _expires_header($days)
     {
         header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + 60 * 60 * 24 * $days));
     }

htdocs/application/controllers/Unittest.php

@@ -1,29 +1,22 @@
-<?php
+<?php if (!defined('BASEPATH')) {
-/**
+    exit('No direct script access allowed');
- * Class and Function List:
+}
- * Function list:
- * - __construct()
- * - index()
- * Classes list:
- * - Unittest extends CI_Controller
- */
 
 class Unittest extends CI_Controller
 {
 
-	function __construct() 
+    public function __construct()
     {
         parent::__construct();
 
         //protection
 
-		if ($_SERVER['HTTP_HOST'] != 'stikked') 
+        if ($_SERVER['HTTP_HOST'] != 'stikked') {
-		{
             exit;
         }
     }
 
-	function index() 
+    public function index()
     {
         $this->load->library('unit_test');
         $this->load->model('pastes');

htdocs/application/core/MY_Loader.php

@@ -1,26 +1,17 @@
-<?php
+<?php if (!defined('BASEPATH')) {
-/**
+    exit('No direct script access allowed');
- * Class and Function List:
+}
- * Function list:
- * - __construct()
- * - view()
- * - _ci_load()
- * Classes list:
- * - MY_Loader extends CI_Loader
- */
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 class MY_Loader extends CI_Loader
 {
 
-	function __construct() 
+    public function __construct()
     {
         parent::__construct();
         log_message('debug', 'MY_Loader Class Initialized');
     }
 
-	function view($view, $vars = array() , $return = FALSE) 
+    public function view($view, $vars = array(), $return = false)
     {
 
         //theme name
@@ -31,8 +22,7 @@ class MY_Loader extends CI_Loader
 
         //fallback to default view if view in theme not found
 
-		if (!file_exists($view_path)) 
+        if (!file_exists($view_path)) {
-		{
             $view_path = 'themes/default/views/' . $view . '.php';
         }
 
@@ -40,7 +30,7 @@ class MY_Loader extends CI_Loader
         return $this->_ci_load(array(
             '_ci_view' => $view_path,
             '_ci_vars' => $this->_ci_prepare_view_vars($vars),
-			'_ci_return' => $return
+            '_ci_return' => $return,
         ));
     }
 
@@ -59,8 +49,7 @@ class MY_Loader extends CI_Loader
      * @param    array    $_ci_data    Data to load
      * @return    object
      */
-	protected 
+    protected function _ci_load($_ci_data)
-	function _ci_load($_ci_data) 
     {
 
         // Set the default data variables
@@ -68,26 +57,21 @@ class MY_Loader extends CI_Loader
             '_ci_view',
             '_ci_vars',
             '_ci_path',
-			'_ci_return'
+            '_ci_return',
-		) as $_ci_val) 
+        ) as $_ci_val) {
-		{
+            $$_ci_val = isset($_ci_data[$_ci_val]) ? $_ci_data[$_ci_val] : false;
-			$$_ci_val = isset($_ci_data[$_ci_val]) ? $_ci_data[$_ci_val] : FALSE;
         }
-		$file_exists = FALSE;
+        $file_exists = false;
 
         // Set the path to the requested file
 
-		if (is_string($_ci_path) && $_ci_path !== '') 
+        if (is_string($_ci_path) && $_ci_path !== '') {
-		{
             $_ci_x = explode('/', $_ci_path);
             $_ci_file = end($_ci_x);
-		}
+        } else {
-		else
-		{
             $_ci_ext = pathinfo($_ci_view, PATHINFO_EXTENSION);
             $_ci_file = ($_ci_ext === '') ? $_ci_view . '.php' : $_ci_view;
-			foreach ($this->_ci_view_paths as $_ci_view_file => $cascade) 
+            foreach ($this->_ci_view_paths as $_ci_view_file => $cascade) {
-			{
 
                 /* *** modification for stikked themes ***
                  *
@@ -98,22 +82,19 @@ class MY_Loader extends CI_Loader
                  *
                  */
 
-				if (file_exists(FCPATH . $_ci_file)) 
+                if (file_exists(FCPATH . $_ci_file)) {
-				{
                     $_ci_path = FCPATH . $_ci_file;
-					$file_exists = TRUE;
+                    $file_exists = true;
                     break;
                 }
 
-				if (!$cascade) 
+                if (!$cascade) {
-				{
                     break;
                 }
             }
         }
 
-		if (!$file_exists && !file_exists($_ci_path)) 
+        if (!$file_exists && !file_exists($_ci_path)) {
-		{
             show_error('Unable to load the requested file: ' . $_ci_file);
         }
 
@@ -121,11 +102,9 @@ class MY_Loader extends CI_Loader
         // to become accessible from within the Controller and Model functions.
 
         $_ci_CI = &get_instance();
-		foreach (get_object_vars($_ci_CI) as $_ci_key => $_ci_var) 
+        foreach (get_object_vars($_ci_CI) as $_ci_key => $_ci_var) {
-		{
 
-			if (!isset($this->$_ci_key)) 
+            if (!isset($this->$_ci_key)) {
-			{
                 $this->$_ci_key = &$_ci_CI->$_ci_key;
             }
         }
@@ -139,8 +118,7 @@ class MY_Loader extends CI_Loader
          * other views can have access to these variables.
          */
 
-		if (is_array($_ci_vars)) 
+        if (is_array($_ci_vars)) {
-		{
             $this->_ci_cached_vars = array_merge($this->_ci_cached_vars, $_ci_vars);
         }
         extract($this->_ci_cached_vars);
@@ -163,23 +141,17 @@ class MY_Loader extends CI_Loader
 
         // to standard PHP echo statements.
 
-		
+        if (!is_php('5.4') && !ini_get('short_open_tag') && config_item('rewrite_short_tags') === true) {
-		if (!is_php('5.4') && !ini_get('short_open_tag') && config_item('rewrite_short_tags') === TRUE) 
-		{
             echo eval('?>' . preg_replace('/;*\s*\?>/', '; ?>', str_replace('<?=', '<?php echo ', file_get_contents($_ci_path))));
-		}
+        } else {
-		else
+            include $_ci_path; // include() vs include_once() allows for multiple views with the same name
-		{
-			include ($_ci_path); // include() vs include_once() allows for multiple views with the same name
-
 
         }
         log_message('info', 'File loaded: ' . $_ci_path);
 
         // Return the file data if requested
 
-		if ($_ci_return === TRUE) 
+        if ($_ci_return === true) {
-		{
             $buffer = ob_get_contents();
             @ob_end_clean();
             return $buffer;
@@ -195,12 +167,9 @@ class MY_Loader extends CI_Loader
          * template and any subsequent ones. Oy!
          */
 
-		if (ob_get_level() > $this->_ci_ob_level + 1) 
+        if (ob_get_level() > $this->_ci_ob_level + 1) {
-		{
             ob_end_flush();
-		}
+        } else {
-		else
-		{
             $_ci_CI->output->append_output(ob_get_contents());
             @ob_end_clean();
         }

htdocs/application/helpers/captcha_helper.php

@@ -1,14 +1,7 @@
-<?php
+<?php if (!defined('BASEPATH')) {
-/**
+    exit('No direct script access allowed');
- * Class and Function List:
+}
- * Function list:
- * - create_captcha()
- * - display_captcha()
- * - b()
- * Classes list:
- */
 
-if (!defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * CodeIgniter
  *
@@ -48,8 +41,7 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
  * @return    string
  */
 
-if (!function_exists('create_captcha')) 
+if (!function_exists('create_captcha')) {
-{
 
     function create_captcha($data = '', $img_path = '', $img_url = '', $font_path = '')
     {
@@ -60,43 +52,34 @@ if (!function_exists('create_captcha'))
             'img_width' => '150',
             'img_height' => '30',
             'font_path' => '',
-			'expiration' => 7200
+            'expiration' => 7200,
         );
-		foreach ($defaults as $key => $val) 
+        foreach ($defaults as $key => $val) {
-		{
 
-			if (!is_array($data)) 
+            if (!is_array($data)) {
-			{
 
-				if (!isset($$key) OR $$key == '') 
+                if (!isset($$key) or $$key == '') {
-				{
                     $$key = $val;
                 }
-			}
+            } else {
-			else
-			{
                 $$key = (!isset($data[$key])) ? $val : $data[$key];
             }
         }
 
-		if ($img_path == '' OR $img_url == '') 
+        if ($img_path == '' or $img_url == '') {
-		{
+            return false;
-			return FALSE;
         }
 
-		if (!@is_dir($img_path)) 
+        if (!@is_dir($img_path)) {
-		{
+            return false;
-			return FALSE;
         }
 
-		if (!is_writable($img_path)) 
+        if (!is_writable($img_path)) {
-		{
+            return false;
-			return FALSE;
         }
 
-		if (!extension_loaded('gd')) 
+        if (!extension_loaded('gd')) {
-		{
+            return false;
-			return FALSE;
         }
 
         // -----------------------------------
@@ -107,15 +90,12 @@ if (!function_exists('create_captcha'))
         list($usec, $sec) = explode(" ", microtime());
         $now = ((float) $usec + (float) $sec);
         $current_dir = @opendir($img_path);
-		while ($filename = @readdir($current_dir)) 
+        while ($filename = @readdir($current_dir)) {
-		{
 
-			if ($filename != "." and $filename != ".." and $filename != "index.html") 
+            if ($filename != "." and $filename != ".." and $filename != "index.html") {
-			{
                 $name = str_replace(".jpg", "", $filename);
 
-				if (($name + $expiration) < $now) 
+                if (($name + $expiration) < $now) {
-				{
                     @unlink($img_path . $filename);
                 }
             }
@@ -127,13 +107,10 @@ if (!function_exists('create_captcha'))
 
         // -----------------------------------
 
-		
+        if ($word == '') {
-		if ($word == '') 
-		{
             $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
             $str = '';
-			for ($i = 0;$i < 8;$i++) 
+            for ($i = 0; $i < 8; $i++) {
-			{
                 $str .= substr($pool, mt_rand(0, strlen($pool) - 1), 1);
             }
             $word = $str;
@@ -156,13 +133,9 @@ if (!function_exists('create_captcha'))
 
         // PHP.net recommends imagecreatetruecolor(), but it isn't always available
 
-		
+        if (function_exists('imagecreatetruecolor')) {
-		if (function_exists('imagecreatetruecolor')) 
-		{
             $im = imagecreatetruecolor($img_width, $img_height);
-		}
+        } else {
-		else
-		{
             $im = imagecreate($img_width, $img_height);
         }
 
@@ -194,8 +167,7 @@ if (!function_exists('create_captcha'))
         $radius = 16;
         $circles = 20;
         $points = 32;
-		for ($i = 0;$i < ($circles * $points) - 1;$i++) 
+        for ($i = 0; $i < ($circles * $points) - 1; $i++) {
-		{
             $theta = $theta + $thetac;
             $rad = $radius * ($i / $points);
             $x = ($rad * cos($theta)) + $x_axis;
@@ -213,31 +185,24 @@ if (!function_exists('create_captcha'))
 
         // -----------------------------------
 
-		$use_font = ($font_path != '' AND file_exists($font_path) AND function_exists('imagettftext')) ? TRUE : FALSE;
+        $use_font = ($font_path != '' and file_exists($font_path) and function_exists('imagettftext')) ? true : false;
 
-		if ($use_font == FALSE) 
+        if ($use_font == false) {
-		{
             $font_size = 5;
             $x = rand(0, $img_width / ($length / 3));
             $y = 0;
-		}
+        } else {
-		else
-		{
             $font_size = 16;
             $x = rand(0, $img_width / ($length / 1.5));
             $y = $font_size + 2;
         }
-		for ($i = 0;$i < strlen($word);$i++) 
+        for ($i = 0; $i < strlen($word); $i++) {
-		{
 
-			if ($use_font == FALSE) 
+            if ($use_font == false) {
-			{
                 $y = rand(0, $img_height / 2);
                 imagestring($im, $font_size, $x, $y, substr($word, $i, 1), $text_color);
                 $x += ($font_size * 2);
-			}
+            } else {
-			else
-			{
                 $y = rand($img_height / 2, $img_height - 3);
                 imagettftext($im, $font_size, $angle, $x, $y, $text_color, $font_path, substr($word, $i, 1));
                 $x += $font_size;
@@ -263,7 +228,7 @@ if (!function_exists('create_captcha'))
         return array(
             'word' => $word,
             'time' => $now,
-			'image' => $img
+            'image' => $img,
         );
     }
 }
@@ -274,8 +239,7 @@ if (!function_exists('create_captcha'))
  * @return    string
  */
 
-if (!function_exists('display_captcha')) 
+if (!function_exists('display_captcha')) {
-{
 
     function display_captcha($word = '')
     {
@@ -289,28 +253,22 @@ if (!function_exists('display_captcha'))
             'img_width' => '180',
             'img_height' => '40',
             'font_path' => '',
-			'expiration' => 7200
+            'expiration' => 7200,
         );
-		foreach ($defaults as $key => $val) 
+        foreach ($defaults as $key => $val) {
-		{
 
-			if (!is_array($data)) 
+            if (!is_array($data)) {
-			{
 
-				if (!isset($$key) OR $$key == '') 
+                if (!isset($$key) or $$key == '') {
-				{
                     $$key = $val;
                 }
-			}
+            } else {
-			else
-			{
                 $$key = (!isset($data[$key])) ? $val : $data[$key];
             }
         }
 
-		if (!extension_loaded('gd')) 
+        if (!extension_loaded('gd')) {
-		{
+            return false;
-			return FALSE;
         }
 
         // -----------------------------------
@@ -318,13 +276,10 @@ if (!function_exists('display_captcha'))
 
         // -----------------------------------
 
-		
+        if ($word == '') {
-		if ($word == '') 
-		{
             $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
             $str = '';
-			for ($i = 0;$i < 4;$i++) 
+            for ($i = 0; $i < 4; $i++) {
-			{
                 $str .= substr($pool, mt_rand(0, strlen($pool) - 1), 1);
             }
             $word = $str;
@@ -348,13 +303,9 @@ if (!function_exists('display_captcha'))
 
         // PHP.net recommends imagecreatetruecolor(), but it isn't always available
 
-		
+        if (function_exists('imagecreatetruecolor')) {
-		if (function_exists('imagecreatetruecolor')) 
-		{
             $im = imagecreatetruecolor($img_width, $img_height);
-		}
+        } else {
-		else
-		{
             $im = imagecreate($img_width, $img_height);
         }
 
@@ -363,7 +314,6 @@ if (!function_exists('display_captcha'))
 
         // -----------------------------------
 
-		
         function b()
         {
             return mt_rand(240, 255);
@@ -391,8 +341,7 @@ if (!function_exists('display_captcha'))
         $radius = 16;
         $circles = 20;
         $points = 32;
-		for ($i = 0;$i < ($circles * $points) - 1;$i++) 
+        for ($i = 0; $i < ($circles * $points) - 1; $i++) {
-		{
             $theta = $theta + $thetac;
             $rad = $radius * ($i / $points);
             $x = ($rad * cos($theta)) + $x_axis;
@@ -415,31 +364,24 @@ if (!function_exists('display_captcha'))
         $fn = explode(',', '4,5,6,8,16,17,19,24,26');
         $f = mt_rand(0, count($fn) - 1);
         $font_path = './static/fonts/font' . $fn[$f] . '.ttf';
-		$use_font = ($font_path != '' AND file_exists($font_path) AND function_exists('imagettftext')) ? TRUE : FALSE;
+        $use_font = ($font_path != '' and file_exists($font_path) and function_exists('imagettftext')) ? true : false;
 
-		if ($use_font == FALSE) 
+        if ($use_font == false) {
-		{
             $font_size = 5;
             $x = mt_rand(0, $img_width / ($length / 3));
             $y = 0;
-		}
+        } else {
-		else
-		{
             $font_size = 16;
             $x = mt_rand(0, $img_width / ($length / 1.5));
             $y = $font_size + 2;
         }
-		for ($i = 0;$i < strlen($word);$i++) 
+        for ($i = 0; $i < strlen($word); $i++) {
-		{
 
-			if ($use_font == FALSE) 
+            if ($use_font == false) {
-			{
                 $y = mt_rand(0, $img_height / 2);
                 imagestring($im, $font_size, $x, $y, substr($word, $i, 1), $text_color);
                 $x += ($font_size * 2);
-			}
+            } else {
-			else
-			{
                 $y = mt_rand($img_height / 2, $img_height - 3);
                 imagettftext($im, $font_size, $angle, $x, $y, $text_color, $font_path, substr($word, $i, 1));
                 $x += $font_size;
@@ -467,5 +409,4 @@ if (!function_exists('display_captcha'))
 // ------------------------------------------------------------------------
 /* End of file captcha_helper.php */
 
-
 /* Location: ./system/heleprs/captcha_helper.php */

htdocs/application/helpers/json_helper.php

@@ -1,19 +1,13 @@
-<?php
+<?php if (!defined('BASEPATH')) {
-/**
+    exit('No direct script access allowed');
- * Class and Function List:
+}
- * Function list:
- * - json_encode()
- * Classes list:
- */
-//If you are on a version of PHP before 5.2, this might help:
 
-if (!function_exists('json_encode')) 
+//If you are on a version of PHP before 5.2, this might help:
-{
+if (!function_exists('json_encode')) {
 
     function json_encode($data)
     {
-		switch ($type = gettype($data)) 
+        switch ($type = gettype($data)) {
-		{
             case 'NULL':
                 return 'null';
             case 'boolean':
@@ -30,29 +24,23 @@ if (!function_exists('json_encode'))
                 $output_index_count = 0;
                 $output_indexed = array();
                 $output_associative = array();
-			foreach ($data as $key => $value) 
+                foreach ($data as $key => $value) {
-			{
                     $output_indexed[] = json_encode($value);
                     $output_associative[] = json_encode($key) . ':' . json_encode($value);
 
-				if ($output_index_count !== NULL && $output_index_count++ !== $key) 
+                    if ($output_index_count !== null && $output_index_count++ !== $key) {
-				{
+                        $output_index_count = null;
-					$output_index_count = NULL;
                     }
                 }
 
-			if ($output_index_count !== NULL) 
+                if ($output_index_count !== null) {
-			{
                     return '[' . implode(',', $output_indexed) . ']';
-			}
+                } else {
-			else
-			{
                     return '{' . implode(',', $output_associative) . '}';
                 }
             default:
                 return ''; // Not supported
 
-			
         }
     }
 }

htdocs/application/helpers/language_helper.php

@@ -1,13 +1,7 @@
-<?php
+<?php if (!defined('BASEPATH')) {
-/**
+    exit('No direct script access allowed');
- * Class and Function List:
+}
- * Function list:
- * - lang()
- * - random_expire_msg()
- * Classes list:
- */
 
-if (!defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * CodeIgniter
  *
@@ -47,16 +41,14 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
  * @return    string
  */
 
-if (!function_exists('lang')) 
+if (!function_exists('lang')) {
-{
 
     function lang($index, $id = '')
     {
         $CI = &get_instance();
         $line = $CI->lang->line($index);
 
-		if ($id != '') 
+        if ($id != '') {
-		{
             $line = '<label for="' . $id . '">' . $line . "</label>";
         }
         return ($line != '' ? $line : '[' . $index . ']');
@@ -71,8 +63,7 @@ if (!function_exists('lang'))
  * @return    string
  */
 
-if (!function_exists('random_expire_msg')) 
+if (!function_exists('random_expire_msg')) {
-{
 
     function random_expire_msg()
     {
@@ -85,5 +76,4 @@ if (!function_exists('random_expire_msg'))
 // ------------------------------------------------------------------------
 /* End of file language_helper.php */
 
-
 /* Location: ./system/helpers/language_helper.php */

htdocs/application/helpers/recaptcha_helper.php

@@ -44,18 +44,18 @@ define("RECAPTCHA_VERIFY_SERVER", "www.google.com");
  * @param $data - array of string elements to be encoded
  * @return string - encoded request
  */
-function _recaptcha_qsencode ($data) {
+function _recaptcha_qsencode($data)
+{
     $req = "";
-        foreach ( $data as $key => $value )
+    foreach ($data as $key => $value) {
         $req .= $key . '=' . urlencode(stripslashes($value)) . '&';
+    }
 
     // Cut the last '&'
     $req = substr($req, 0, strlen($req) - 1);
     return $req;
 }
 
-
-
 /**
  * Submits an HTTP POST to a reCAPTCHA server
  * @param string $host
@@ -64,7 +64,8 @@ function _recaptcha_qsencode ($data) {
  * @param int port
  * @return array response
  */
-function _recaptcha_http_post($host, $path, $data, $port = 80) {
+function _recaptcha_http_post($host, $path, $data, $port = 80)
+{
 
     $req = _recaptcha_qsencode($data);
 
@@ -83,16 +84,16 @@ function _recaptcha_http_post($host, $path, $data, $port = 80) {
 
     fwrite($fs, $http_request);
 
-        while ( !feof($fs) )
+    while (!feof($fs)) {
-                $response .= fgets($fs, 1160); // One TCP-IP packet
+        $response .= fgets($fs, 1160);
+    }
+    // One TCP-IP packet
     fclose($fs);
     $response = explode("\r\n\r\n", $response, 2);
 
     return $response;
 }
 
-
-
 /**
  * Gets the challenge HTML (javascript and non-javascript version).
  * This is called from the browser, and the resulting reCAPTCHA HTML widget
@@ -122,7 +123,6 @@ function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
     return '<script src=\'https://www.google.com/recaptcha/api.js\'></script>
 		<div class="g-recaptcha" data-sitekey="' . $pubkey . '"></div>';
 
-
     /*return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
 
 <noscript>
@@ -132,18 +132,15 @@ function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
 </noscript>';*/
 }
 
-
-
-
 /**
  * A ReCaptchaResponse is returned from recaptcha_check_answer()
  */
-class ReCaptchaResponse {
+class ReCaptchaResponse
-        var $is_valid;
+{
-        var $error;
+    public $is_valid;
+    public $error;
 }
 
-
 /**
  * Calls an HTTP POST function to verify if the user's guess was correct
  * @param string $privkey
@@ -163,8 +160,6 @@ function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $ex
         die("For security reasons, you must pass the remote ip to reCAPTCHA");
     }
 
-	
-	
     //discard spam submissions
     if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
         $recaptcha_response = new ReCaptchaResponse();
@@ -178,7 +173,7 @@ function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $ex
             'privatekey' => $privkey,
             'remoteip' => $remoteip,
             'challenge' => $challenge,
-                                                 'response' => $response
+            'response' => $response,
         ) + $extra_params
     );
 
@@ -187,8 +182,7 @@ function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $ex
 
     if (trim($answers[0]) == 'true') {
         $recaptcha_response->is_valid = true;
-        }
+    } else {
-        else {
         $recaptcha_response->is_valid = false;
         $recaptcha_response->error = $answers[1];
     }
@@ -203,11 +197,13 @@ function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $ex
  * @param string $domain The domain where the page is hosted
  * @param string $appname The name of your application
  */
-function recaptcha_get_signup_url ($domain = null, $appname = null) {
+function recaptcha_get_signup_url($domain = null, $appname = null)
+{
     return "https://www.google.com/recaptcha/admin/create?" . _recaptcha_qsencode(array('domains' => $domain, 'app' => $appname));
 }
 
-function _recaptcha_aes_pad($val) {
+function _recaptcha_aes_pad($val)
+{
     $block_size = 16;
     $numpad = $block_size - (strlen($val) % $block_size);
     return str_pad($val, strlen($val) + $numpad, chr($numpad));
@@ -215,7 +211,8 @@ function _recaptcha_aes_pad($val) {
 
 /* Mailhide related code */
 
-function _recaptcha_aes_encrypt($val,$ky) {
+function _recaptcha_aes_encrypt($val, $ky)
+{
     if (!function_exists("mcrypt_encrypt")) {
         die("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
     }
@@ -225,19 +222,19 @@ function _recaptcha_aes_encrypt($val,$ky) {
     return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
 }
 
-
+function _recaptcha_mailhide_urlbase64($x)
-function _recaptcha_mailhide_urlbase64 ($x) {
+{
     return strtr(base64_encode($x), '+/', '-_');
 }
 
 /* gets the reCAPTCHA Mailhide url for a given email, public key and private key */
-function recaptcha_mailhide_url($pubkey, $privkey, $email) {
+function recaptcha_mailhide_url($pubkey, $privkey, $email)
+{
     if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
         die("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
             "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
     }
 
-
     $ky = pack('H*', $privkey);
     $cryptmail = _recaptcha_aes_encrypt($email, $ky);
 
@@ -249,7 +246,8 @@ function recaptcha_mailhide_url($pubkey, $privkey, $email) {
  * eg, given johndoe@example,com return ["john", "example.com"].
  * the email is then displayed as john...@example.com
  */
-function _recaptcha_mailhide_email_parts ($email) {
+function _recaptcha_mailhide_email_parts($email)
+{
     $arr = preg_split("/@/", $email);
 
     if (strlen($arr[0]) <= 4) {
@@ -268,7 +266,8 @@ function _recaptcha_mailhide_email_parts ($email) {
  *
  * http://www.google.com/recaptcha/mailhide/apikey
  */
-function recaptcha_mailhide_html($pubkey, $privkey, $email) {
+function recaptcha_mailhide_html($pubkey, $privkey, $email)
+{
     $emailparts = _recaptcha_mailhide_email_parts($email);
     $url = recaptcha_mailhide_url($pubkey, $privkey, $email);
 
@@ -276,6 +275,3 @@ function recaptcha_mailhide_html($pubkey, $privkey, $email) {
     "' onclick=\"window.open('" . htmlentities($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities($emailparts[1]);
 
 }
-
-
-?>

htdocs/application/models/Languages.php

@@ -1,61 +1,48 @@
-<?php
+<?php if (!defined('BASEPATH')) {
-/**
+    exit('No direct script access allowed');
- * Class and Function List:
+}
- * Function list:
- * - __construct()
- * - valid_language()
- * - get_languages()
- * - code_to_description()
- * Classes list:
- * - Languages extends CI_Model
- */
 
 class Languages extends CI_Model
 {
 
-	function __construct() 
+    public function __construct()
     {
         parent::__construct();
         $this->load->config('geshi_languages');
         $this->geshi_languages = $this->config->item('geshi_languages');
         $this->favorite_languages = $this->config->item('favorite_languages');
 
-		if ($this->favorite_languages === NULL) 
+        if ($this->favorite_languages === null) {
-		{
             $this->load->config('config');
             $this->favorite_languages = $this->config->item('favorite_languages');
         }
     }
 
-	function valid_language($lang) 
+    public function valid_language($lang)
     {
         return array_key_exists($lang, $this->geshi_languages);
     }
 
-	function get_languages() 
+    public function get_languages()
     {
         $data = array();
 
-		if (is_array($this->favorite_languages)) 
+        if (is_array($this->favorite_languages)) {
-		{
+            foreach ($this->favorite_languages as $key) {
-			foreach ($this->favorite_languages as $key) 
-			{
                 $data[$key] = $this->geshi_languages[$key];
             }
             $data["0"] = "-----------------";
         }
-		foreach ($this->geshi_languages as $key => $value) 
+        foreach ($this->geshi_languages as $key => $value) {
-		{
 
-			if (!in_array($key, $data)) 
+            if (!in_array($key, $data)) {
-			{
                 $data[$key] = $value;
             }
         }
         return $data;
     }
 
-	function code_to_description($code) 
+    public function code_to_description($code)
     {
         return $this->geshi_languages[$code];
     }

htdocs/index.php

@@ -63,8 +63,7 @@
  * Different environments will require different levels of error reporting.
  * By default development will show errors but testing and live will hide them.
  */
-switch (ENVIRONMENT)
+switch (ENVIRONMENT) {
-{
     case 'development':
         error_reporting(-1);
         ini_set('display_errors', 1);
@@ -73,18 +72,15 @@ switch (ENVIRONMENT)
     case 'testing':
     case 'production':
         ini_set('display_errors', 0);
-		if (version_compare(PHP_VERSION, '5.3', '>='))
+        if (version_compare(PHP_VERSION, '5.3', '>=')) {
-		{
             error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
-		}
+        } else {
-		else
-		{
             error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
         }
         break;
 
     default:
-		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
+        header('HTTP/1.1 503 Service Unavailable.', true, 503);
         echo 'The application environment is not set correctly.';
         exit(1); // EXIT_ERROR
 }
@@ -131,7 +127,6 @@ switch (ENVIRONMENT)
  */
 $view_folder = 'themes/default/views';
 
-
 /*
  * --------------------------------------------------------------------
  * DEFAULT CONTROLLER
@@ -161,7 +156,6 @@ switch (ENVIRONMENT)
 // The controller function you wish to be called.
 // $routing['function']    = '';
 
-
 /*
  * -------------------------------------------------------------------
  *  CUSTOM CONFIG VALUES
@@ -178,8 +172,6 @@ switch (ENVIRONMENT)
  */
 // $assign_to_config['name_of_config_item'] = 'value of config item';
 
-
-
 // --------------------------------------------------------------------
 // END OF USER CONFIGURABLE SETTINGS.  DO NOT EDIT BELOW THIS LINE
 // --------------------------------------------------------------------
@@ -191,17 +183,13 @@ switch (ENVIRONMENT)
  */
 
 // Set the current directory correctly for CLI requests
-	if (defined('STDIN'))
+if (defined('STDIN')) {
-	{
     chdir(dirname(__FILE__));
 }
 
-	if (($_temp = realpath($system_path)) !== FALSE)
+if (($_temp = realpath($system_path)) !== false) {
-	{
     $system_path = $_temp . DIRECTORY_SEPARATOR;
-	}
+} else {
-	else
-	{
     // Ensure there's a trailing slash
     $system_path = strtr(
         rtrim($system_path, '/\\'),
@@ -211,9 +199,8 @@ switch (ENVIRONMENT)
 }
 
 // Is the system path correct?
-	if ( ! is_dir($system_path))
+if (!is_dir($system_path)) {
-	{
+    header('HTTP/1.1 503 Service Unavailable.', true, 503);
-		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
     echo 'Your system folder path does not appear to be set correctly. Please open the following file and correct this: ' . pathinfo(__FILE__, PATHINFO_BASENAME);
     exit(3); // EXIT_CONFIG
 }
@@ -236,32 +223,24 @@ switch (ENVIRONMENT)
 define('SYSDIR', basename(BASEPATH));
 
 // The path to the "application" directory
-	if (is_dir($application_folder))
+if (is_dir($application_folder)) {
-	{
+    if (($_temp = realpath($application_folder)) !== false) {
-		if (($_temp = realpath($application_folder)) !== FALSE)
-		{
         $application_folder = $_temp;
-		}
+    } else {
-		else
-		{
         $application_folder = strtr(
             rtrim($application_folder, '/\\'),
             '/\\',
             DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR
         );
     }
-	}
+} elseif (is_dir(BASEPATH . $application_folder . DIRECTORY_SEPARATOR)) {
-	elseif (is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
-	{
     $application_folder = BASEPATH . strtr(
         trim($application_folder, '/\\'),
         '/\\',
         DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR
     );
-	}
+} else {
-	else
+    header('HTTP/1.1 503 Service Unavailable.', true, 503);
-	{
-		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
     echo 'Your application folder path does not appear to be set correctly. Please open the following file and correct this: ' . SELF;
     exit(3); // EXIT_CONFIG
 }
@@ -269,36 +248,26 @@ switch (ENVIRONMENT)
 define('APPPATH', $application_folder . DIRECTORY_SEPARATOR);
 
 // The path to the "views" directory
-	if ( ! isset($view_folder[0]) && is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
+if (!isset($view_folder[0]) && is_dir(APPPATH . 'views' . DIRECTORY_SEPARATOR)) {
-	{
     $view_folder = APPPATH . 'views';
-	}
+} elseif (is_dir($view_folder)) {
-	elseif (is_dir($view_folder))
+    if (($_temp = realpath($view_folder)) !== false) {
-	{
-		if (($_temp = realpath($view_folder)) !== FALSE)
-		{
         $view_folder = $_temp;
-		}
+    } else {
-		else
-		{
         $view_folder = strtr(
             rtrim($view_folder, '/\\'),
             '/\\',
             DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR
         );
     }
-	}
+} elseif (is_dir(APPPATH . $view_folder . DIRECTORY_SEPARATOR)) {
-	elseif (is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
-	{
     $view_folder = APPPATH . strtr(
         trim($view_folder, '/\\'),
         '/\\',
         DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR
     );
-	}
+} else {
-	else
+    header('HTTP/1.1 503 Service Unavailable.', true, 503);
-	{
-		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
     echo 'Your view folder path does not appear to be set correctly. Please open the following file and correct this: ' . SELF;
     exit(3); // EXIT_CONFIG
 }

htdocs/themes/bootstrap/js/stikked.js

@@ -38,24 +38,24 @@ ST.spamadmin = function() {
         return this.add(selector == null ? this.prevObject : this.prevObject.filter(selector));
     }
 
-    // $('.selectable>tbody').selectable({
+    $('.selectable>tbody').selectable({
-    //     filter: 'tr',
+        filter: 'tr',
-    //     cancel: 'a',
+        cancel: 'a',
-    //     stop: function() {
+        stop: function () {
-    //         var $deletestack = $(".paste_deletestack");
+            var $deletestack = $(".paste_deletestack");
-    //         var $input = $("input[name=pastes_to_delete]");
+            var $input = $("input[name=pastes_to_delete]");
-    //         $('.inv').show();
+            $('.inv').show();
-    //         $deletestack.empty();
+            $deletestack.empty();
-    //         $input.empty();
+            $input.empty();
-    //         var res = [];
+            var res = [];
-    //         $(".ui-selected").each(function(i, el) {
+            $(".ui-selected").each(function (i, el) {
-    //             var id = $('a', el).attr('href').split('view/')[1];
+                var id = $('a', el).attr('href').split('view/')[1];
-    //             res.push(id);
+                res.push(id);
-    //         });
+            });
-    //         $deletestack.text(res.join(' '));
+            $deletestack.text(res.join(' '));
-    //         $input.val(res.join(' '));
+            $input.val(res.join(' '));
-    //     }
+        }
-    // });
+    });
 };
 
 ST.line_highlighter = function () {
@@ -152,7 +152,9 @@ ST.crypto = function() {
                     $('.container .message').remove();
                     $('.container:eq(1)').prepend('<div class="message error"><div class="container">The captcha is incorrect.</div></div>');
                 } else if (redirect_url.indexOf('invalid') > -1) {
-                    $('#create_encrypted').parent().html('<p>' + redirect_url + '#' + key + '</p>');
+                    // burn on read
+                    redirect_url = redirect_url.replace('" /><!-- behind you -->', '#' + key + '" />')
+                    $('#create_encrypted').parent().html('<p>' + redirect_url + '</p>');
                 } else {
                     window.location.href = base_url + redirect_url + '#' + key;
                 }

htdocs/themes/default/js/stikked.js

@@ -181,7 +181,9 @@ ST.crypto = function() {
                     $('.content .container .message').remove();
                     $('.content .container').prepend('<div class="message error"><div class="container">The captcha is incorrect.</div></div>');
                 } else if (redirect_url.indexOf('invalid') > -1) {
-                    $('#create_encrypted').parent().html('<p>' + redirect_url + '#' + key + '</p>');
+                    // burn on read
+                    redirect_url = redirect_url.replace('" /><!-- behind you -->', '#' + key + '" />')
+                    $('#create_encrypted').parent().html('<p>' + redirect_url + '</p>');
                 } else {
                     window.location.href = base_url + redirect_url + '#' + key;
                 }

htdocs/themes/default/views/defaults/paste_form.php

@@ -38,12 +38,12 @@
 		</div>
 
 		<div class="item">
-			<label for="paste"><?php echo lang('paste_yourpaste'); ?>
+			<label for="code"><?php echo lang('paste_yourpaste'); ?>
 				<span class="instruction"><?php echo lang('paste_yourpaste_desc'); ?></span>
                 <span class="instruction"><a href="#" id="enable_codemirror" data-lang-enablesynhl="<?php echo lang('paste_enablesynhl'); ?>" data-lang-disablesynhl="<?php echo lang('paste_disablesynhl'); ?>"></a></span>
 			</label>
 
-			<textarea id="code" name="code" cols="40" rows="20" tabindex="4"><?php if(isset($paste_set)){ echo $paste_set; }?></textarea>
+			<textarea id="code" name="code" cols="40" rows="20" tabindex="4" required><?php if(isset($paste_set)){ echo $paste_set; }?></textarea>
 
 		</div>