From f27dfa4efbf6565dfc649e1f7f5fbf8e07128dcb Mon Sep 17 00:00:00 2001
From: ozhozh <ozhozh@12232710-3e20-11de-b438-597f59cd7555>
Date: Thu, 17 Sep 2009 12:25:32 +0000
Subject: [PATCH] Logic change: include "load-yourls.php" instead of
 "config.php" to start engine

git-svn-id: http://yourls.googlecode.com/svn/trunk@170 12232710-3e20-11de-b438-597f59cd7555
---
 admin/index.php              |  4 ++--
 admin/index_ajax.php         |  2 +-
 admin/tools.php              |  2 +-
 admin/upgrade.php            |  2 +-
 includes/load-yourls.php     | 10 +++++++---
 sample-public-front-page.php |  2 +-
 yourls-api.php               |  2 +-
 yourls-go.php                |  2 +-
 yourls-infos.php             |  2 +-
 9 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/admin/index.php b/admin/index.php
index 61f6878..35bef2b 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -1,6 +1,6 @@
 <?php
 // Require Files
-require_once( dirname(dirname(__FILE__)).'/includes/config.php' );
+require_once( dirname(dirname(__FILE__)).'/includes/load-yourls.php' );
 yourls_maybe_require_auth();
 
 // Variables
@@ -15,7 +15,7 @@
 $sort_order_sql = 'desc';
 $page = ( isset( $_GET['page'] ) ? intval($_GET['page']) : 1 );
 $search = ( isset( $_GET['s_search'] ) ? mysql_real_escape_string(trim($_GET['s_search'])) : '' );
-$perpage = ( isset( $_GET['perpage'] ) && intval( $_GET['perpage'] ) ? intval($_GET['perpage']) : 20 );
+$perpage = ( isset( $_GET['perpage'] ) && intval( $_GET['perpage'] ) ? intval($_GET['perpage']) : 15 );
 $link_limit = ( isset( $_GET['link_limit'] ) && intval($_GET['link_limit']) ? intval($_GET['link_limit']) : '' );
 if ( $link_limit != '' ) {
 	$link_filter = ( isset( $_GET['link_filter'] ) && $_GET['link_filter'] == 'more' ? 'more' : 'less' ) ;
diff --git a/admin/index_ajax.php b/admin/index_ajax.php
index c4b6905..5e1613f 100644
--- a/admin/index_ajax.php
+++ b/admin/index_ajax.php
@@ -1,6 +1,6 @@
 <?php
 // Require Files
-require_once( dirname(dirname(__FILE__)).'/includes/config.php' );
+require_once( dirname(dirname(__FILE__)).'/includes/load-yourls.php' );
 yourls_maybe_require_auth();
 
 // This file will output a JSON string
diff --git a/admin/tools.php b/admin/tools.php
index 7522ab9..f4e2710 100644
--- a/admin/tools.php
+++ b/admin/tools.php
@@ -1,6 +1,6 @@
 <?php
 // Require Files
-require_once( dirname(dirname(__FILE__)).'/includes/config.php' );
+require_once( dirname(dirname(__FILE__)).'/includes/load-yourls.php' );
 yourls_maybe_require_auth();
 
 yourls_html_head( 'tools' );
diff --git a/admin/upgrade.php b/admin/upgrade.php
index 73b24a1..a2baca1 100644
--- a/admin/upgrade.php
+++ b/admin/upgrade.php
@@ -1,7 +1,7 @@
 <?php
 // Require Files
 define( 'YOURLS_NO_UPGRADE_CHECK', true ); // Bypass version checking to prevent loop
-require_once( dirname(dirname(__FILE__)).'/includes/config.php' );
+require_once( dirname(dirname(__FILE__)).'/includes/load-yourls.php' );
 require_once( dirname(dirname(__FILE__)).'/includes/functions-upgrade.php' );
 require_once( dirname(dirname(__FILE__)).'/includes/functions-install.php' );
 yourls_maybe_require_auth();
diff --git a/includes/load-yourls.php b/includes/load-yourls.php
index 514f539..0652761 100644
--- a/includes/load-yourls.php
+++ b/includes/load-yourls.php
@@ -1,7 +1,11 @@
 <?php
-// This file initialize everything
+// This file initialize everything needed for YOURLS
 
-// Include everything except auth functions
+// Include settings and functions
+if( !file_exists(dirname(__FILE__).'/config.php') )
+	die('Cannot find <tt>config.php</tt>. Please read the <tt>readme.html</tt> to learn how to install YOURLS');
+	
+require_once (dirname(__FILE__).'/config.php');
 require_once (dirname(__FILE__).'/version.php');
 require_once (dirname(__FILE__).'/functions.php');
 require_once (dirname(__FILE__).'/functions-baseconvert.php');
@@ -25,7 +29,7 @@
 	yourls_db_connect();
 }
 
-// Read option right from start
+// Read options right from start
 yourls_get_all_options();
 
 // Check if upgrade is needed.
diff --git a/sample-public-front-page.php b/sample-public-front-page.php
index 6274fb2..1f42323 100644
--- a/sample-public-front-page.php
+++ b/sample-public-front-page.php
@@ -14,7 +14,7 @@
 <h1>YOURLS: Your Own URL Shortener</h1>
 
 <?php
-require_once( dirname(__FILE__).'/includes/config.php' );
+require_once( dirname(__FILE__).'/includes/load-yourls.php' );
 
 // Part to be executed if FORM has been submitted
 if ( isset($_REQUEST['url']) ) {
diff --git a/yourls-api.php b/yourls-api.php
index f9e16b8..ae68f89 100644
--- a/yourls-api.php
+++ b/yourls-api.php
@@ -1,6 +1,6 @@
 <?php
 define('YOURLS_API', true);
-require_once( dirname(__FILE__).'/includes/config.php' );
+require_once( dirname(__FILE__).'/includes/load-yourls.php' );
 yourls_maybe_require_auth();
 
 if ( !isset($_REQUEST['action']) )
diff --git a/yourls-go.php b/yourls-go.php
index 1da54e9..51bd77e 100644
--- a/yourls-go.php
+++ b/yourls-go.php
@@ -1,6 +1,6 @@
 <?php
 // Require Files
-require_once( dirname(__FILE__).'/includes/config.php' );
+require_once( dirname(__FILE__).'/includes/load-yourls.php' );
 
 // Variables
 $id = ( isset( $_GET['id'] ) ? $_GET['id'] : '' );
diff --git a/yourls-infos.php b/yourls-infos.php
index 428f5e9..ce55728 100644
--- a/yourls-infos.php
+++ b/yourls-infos.php
@@ -1,6 +1,6 @@
 <?php
 // Require Files
-require_once( dirname(__FILE__).'/includes/config.php' );
+require_once( dirname(__FILE__).'/includes/load-yourls.php' );
 require_once( dirname(__FILE__).'/includes/functions-infos.php' );
 yourls_maybe_require_auth();
 
-- 
2.45.0