1
0
mirror of https://github.com/cydrobolt/polr.git synced 2024-09-19 15:11:40 +02:00

Refactor filenames, and clean up some code

This commit is contained in:
Chaoyi Zha 2014-12-28 14:52:06 -05:00
parent a310530195
commit cc6346e6be
42 changed files with 165 additions and 240 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.idea

View File

@ -1,4 +1,4 @@
<!-- polr 404 -->
<?php require_once('header.php');?>
<?php require_once('layout-headerlg.php');?>
<h1>404</h1><br><h2>You step in the stream</h2><h2>But the water has moved on.</h2><h2>This page is not here</h2></div>
<?php require_once('footer.php');?>
<?php require_once('layout-footerlg.php');?>

View File

@ -1,10 +1,10 @@
<?php
@(include('config.php')) or header('Location:setup.php');
require_once 'headerpage.php';
require_once 'layout-headermd.php';
require_once('version.php');
?>
<?php
require_once('req.php');
require_once('lib-core.php');
if ($_SESSION['role']=="adm") {
echo "
<h1>About Polr</h1>
@ -38,5 +38,5 @@ if ($_SESSION['role']=="adm") {
along with this program. If not, see <a href='http://www.gnu.org/copyleft/gpl.html'>http://www.gnu.org/copyleft/gpl.html</a>.
</div>
<?php
require_once 'footerpage.php';
require_once 'layout-footermd.php';
?>

View File

@ -1,6 +1,6 @@
<?php
require_once 'req.php';
require_once 'lib-core.php';
$ruser = $_GET['user'];
$rusersan = $mysqli->real_escape_string($ruser);
$rkey = $_GET['key'];
@ -10,7 +10,7 @@ function noMc($length = 10) {
return substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, $length);
}
//Please read the message concerning the use of NoMC @ registerproc.php
//Please read the message concerning the use of NoMC @ handle-register.php
$nrkey = sha1(noMc(rand(40,60)));
$rkeys = $mysqli->real_escape_string($rkey);
@ -24,13 +24,13 @@ $iv = $c['rkey'];
if ($iv == $rkey) {
$qr = "UPDATE auth SET valid='1', rkey='{$nrkey}' WHERE username='$rusersan';";
$rr = $mysqli->query($qr) or showerror();
require_once('header.php');
require_once('layout-headerlg.php');
echo "You have successfully activated your account. You may now login (top right)";
require_once('footer.php');
require_once('layout-footerlg.php');
die();
} else {
require_once('header.php');
require_once('layout-headerlg.php');
echo "The key/username you specified is incorrect.";
require_once('footer.php');
require_once('layout-footerlg.php');
die();
}

View File

@ -40,7 +40,7 @@
</ul>
<ul class="nav pull-right navbar-nav">
<?php
require_once('../polrauth.php');
require_once('../lib-auth.php');
$polrauth = new polrauth();
$polrauth->headblock();
?>
@ -50,7 +50,7 @@
<a class="dropdown-toggle" href="#" data-toggle="dropdown">Sign In <strong class="caret"></strong></a>
<div class="dropdown-menu" id="dropdown" style="padding: 15px; padding-bottom: 0px; color:white;">
<h2>Login</h2>
<form action="../loginproc.php" method="post" accept-charset="UTF-8">
<form action="../handle-login.php" method="post" accept-charset="UTF-8">
<input id="user_username" style="margin-bottom: 15px;" type="text" name="username" placeholder='Username' size="30" class="form-control">
<input id="user_password" style="margin-bottom: 15px;" type="password" name="password" placeholder='Password' size="30" class="form-control">

View File

@ -40,7 +40,7 @@
</ul>
<ul class="nav pull-right navbar-nav">
<?php
require_once('../polrauth.php');
require_once('../lib-auth.php');
$polrauth = new polrauth();
$polrauth->headblock();
?>
@ -50,7 +50,7 @@
<a class="dropdown-toggle" href="#" data-toggle="dropdown">Sign In <strong class="caret"></strong></a>
<div class="dropdown-menu" id="dropdown" style="padding: 15px; padding-bottom: 0px; color:white;">
<h2>Login</h2>
<form action="../loginproc.php" method="post" accept-charset="UTF-8">
<form action="../handle-login.php" method="post" accept-charset="UTF-8">
<input id="user_username" style="margin-bottom: 15px;" type="text" name="username" placeholder='Username' size="30" class="form-control">
<input id="user_password" style="margin-bottom: 15px;" type="password" name="password" placeholder='Password' size="30" class="form-control">

View File

@ -1,13 +1,13 @@
<?php
require_once '../req.php';
require_once '../lib-core.php';
require_once 'headerpage.php';
require_once '../polrauth.php';
require_once '../lib-auth.php';
$auth = new polrauth();
$isadmin = $auth->isadminli();
if (!is_array($auth->islogged())) {
echo "<h3>You must login to access this page.</h3><br><a href='index.php'>Home</a>";
require_once '../footer.php';
require_once '../layout-footerlg.php';
die(); //END NOT LOGGED IN PORTION
} else {
$userinfo = $auth->islogged();
@ -30,13 +30,12 @@ if (!is_array($auth->islogged())) {
}
$linkshtml = fetchurls();
echo "<script src='../js/ucptabs.js'></script>";
echo "<h3>Polr Dashboard</h3><br>";
echo '<ul class="nav nav-tabs" id="tabsb">
<li class="active"><a href="#home" data-toggle="tab">Home</a></li>
<li><a href="#links" data-toggle="tab">My links</a></li>
<li><a href="#messages" data-toggle="tab">Messages</a></li>
<li><a href="#settings" data-toggle="tab">Settings</a></li>';
<li class="active"><a href="#home" data-toggle="tab">Home</a></li>
<li><a href="#links" data-toggle="tab">My links</a></li>
<li><a href="#messages" data-toggle="tab">Messages</a></li>
<li><a href="#settings" data-toggle="tab">Settings</a></li>';
if ($isadmin == true) {
echo '<li><a href="#adminpanel" data-toggle="tab">Admin Panel</a></li>';
@ -101,29 +100,27 @@ if (!is_array($auth->islogged())) {
}
}
echo '</ul>';
echo '<div class="tab-content">
<div class="tab-pane active" id="home"><br><h2>Welcome to '.$wsn.' user dashboard. Powered by <a href="//github.com/cydrobolt/polr">Polr</a>; Made with <3, <code>$ bash</code>, and lots of <code>git push</code>es</div>
<div class="tab-pane" id="links"><br>' . $linkshtml . '</div>
<div class="tab-pane active" id="home"><br><h2>Welcome to '.$wsn.' Polr dashboard.</div>
<div class="tab-pane" id="links"><br>' . $linkshtml . '</div>
'.$msges.'
<div class="tab-pane" id="settings"><br>
<h3>Change password</h3>
<form action=\'ucp-settingsp.php\' method=\'POST\'>
<input type=\'hidden\' name=\'action\' value=\'changepw\' />
Old Password: <input type=\'password\' name=\'currpw\' />
New Password: <input type=\'password\' name=\'newpw\' />
<input type=\'submit\' class=\'btn btn-success\'/>
</form>
</div>';
'.$msges.'
<div class="tab-pane" id="settings"><br>
<h3>Change password</h3>
<form action=\'ucp-settingsp.php\' method=\'POST\'>
<input type=\'hidden\' name=\'action\' value=\'changepw\' />
Old Password: <input type=\'password\' name=\'currpw\' />
New Password: <input type=\'password\' name=\'newpw\' />
<input type=\'submit\' class=\'btn btn-success\'/>
</form>
</div>';
if ($isadmin == true) {
$sessiondump = "";
foreach ($_SESSION as $sevar) {
$sessiondump = $sessiondump . '<br>' . $sevar;
}
echo '<div class="tab-pane" id="adminpanel"><br>Polr Links - Limited @ 720:' . $linksadmin . '<br>Polr Users - Limited @ 360:' . $usersadmin. '<script src="../js/ucpjs.js"></script>';
if ($debug==1) {
echo '<div class="tab-pane" id="adminpanel"><br>Polr Links - Limited @ 720:' . $linksadmin . '<br>Polr Users - Limited @ 360:' . $usersadmin. '<script src="../js/ucp.js"></script>';
if ($debug == 1) {
'<br>Debug Variables: <br>Default IP Fetch: ' . $ip . '<br>X-Forwarded-For:' . @$headers['X-Forwarded-For'] . '<br>Forwarded-For' . @$headers['forwarded-for'];
}
}
@ -131,5 +128,3 @@ if (!is_array($auth->islogged())) {
echo '</div>';
}
//require_once 'footerpage.php';

View File

@ -1,6 +1,6 @@
<?php
require_once '../req.php';
require_once '../polrauth.php';
require_once '../lib-core.php';
require_once '../lib-auth.php';
$polrauth = new polrauth();
$baseval = $mysqli->real_escape_string($_POST['baseval']);
$userinfo = $polrauth->islogged();

View File

@ -1,6 +1,6 @@
<?php
require_once '../req.php';
require_once '../polrauth.php';
require_once '../lib-core.php';
require_once '../lib-auth.php';
$polrauth = new polrauth();
$baseval = $mysqli->real_escape_string($_POST['baseval']);
$userinfo = $polrauth->islogged();

View File

@ -1,9 +1,9 @@
<?php
require_once '../req.php';
require_once '../lib-core.php';
if (!$_SESSION['li']) {
header('Location: index.php');
}
require_once '../polrauth.php';
require_once '../lib-auth.php';
$polrauth = new polrauth();
$islogged = $polrauth->islogged();
$action = $mysqli->real_escape_string($_POST['action']);
@ -12,7 +12,7 @@ if ($action == 'changepw') {
$currpw = $mysqli->real_escape_string($_POST['currpw']);
$newpw = $mysqli->real_escape_string($_POST['newpw']);
require_once '../password.php';
require_once '../lib-password.php';
function noMc($length = 23) {
return substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, $length);
}
@ -30,7 +30,7 @@ if ($action == 'changepw') {
if (!$islegit) {
require_once 'header.php';
echo "Invalid current password. <a href=\"index.php\">Back</a>";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die();
}
@ -39,12 +39,12 @@ if ($action == 'changepw') {
if ($res) {
require_once 'header.php';
echo "Success! <a href='index.php'>Back</a>";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die();
} else {
require_once 'header.php';
echo "Error! <a href='index.php'>Back</a>";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die();
}
}

View File

@ -12,7 +12,7 @@
* OptEndpoint: temp - whether the URL is temporary or not
*/
$reqargs['nosession'] = true;
require_once('req.php'); //Fetch Config
require_once('lib-core.php'); //Fetch Config
require_once('dnsbl.php'); //Load Google SafeBrowsing Script
$protocol = '://';

View File

@ -1,64 +0,0 @@
<?php
/*
* http://github.com/cydrobolt/polr
*/
//To use this, put this in your app
// --> include('appcalls.php'); if appcalls.php is in the same directory as the script calling it
// --> include('/path/to/appcalls.php'); if appcalls.php is in another dir
/* This script does not sanitize any input. It also doesn't check whether
* the person calling it has an API key or not. Please only use this
* for shortening urls from your other scripts.
*/
//How to use:
/*
* Simply include this script, then use the functions
* lookup($url); to lookup the baseval (the letters following the slash, e.g polr.cf/<baseval>)
* of an url to find the longurl.
*
* shorten($url); shortens a url, returns the shortened url.
*
* The shortened url will be in a http://domain/baseval form. You will need the
* .htaccess file provided in order to accomplish this. r.php must be in your
* domain root.
*
*/
/*
function lookup ($urltl) {
global $mysqli;
$val = $mysqli->real_escape_string($urltl);
$query = "SELECT rurl FROM redirinfo WHERE baseval='{$val}'";
$result = $mysqli->query($query) or die("QUERY ERROR");
$row = mysqli_fetch_assoc($result);
return $row['rurl'];
}
function shorten ($urlr) {
global $mysqli;
global $wsa;
$query1 = "SELECT rid FROM redirinfo WHERE rurl='{$urlr}'";
$result = $mysqli->query($query1);
$row = mysqli_fetch_assoc($result);
$existing = $row['rid'];
if(!$existing) {
$query1 = "SELECT MAX(rid) AS rid FROM redirinfo;";
$result = $mysqli->query($query1);
$row = mysqli_fetch_assoc($result);
$ridr = $row['rid'];
$baseval = base_convert($ridr+1,10,36);
$query2 = "INSERT INTO redirinfo (baseval,rurl) VALUES ('{$baseval}','{$urlr}');";
$result2r = $mysqli->query($query2) or showerror();
return "http://{$wsa}/{$baseval}";
}
else {
$query1 = "SELECT baseval FROM redirinfo WHERE rurl='{$urlr}'";
$result = $mysqli->query($query1);
$row = mysqli_fetch_assoc($result);
$baseval = $row['baseval'];
return "http://{$wsa}/{$baseval}";
}
}
*/
// Unsafe for now

View File

@ -1,7 +1,7 @@
<?php
require_once("req.php");
require_once('header.php');
require_once('polrauth.php');
require_once("lib-core.php");
require_once('layout-headerlg.php');
require_once('lib-auth.php');
$polrauth = new polrauth();
$protocol = '://';
$hpi = $_POST['hp'];
@ -11,7 +11,7 @@ $country_code = @$_SERVER["HTTP_CF_IPCOUNTRY"];
if ($li_shorten_only == true) {
if (!isset($_SESSION['username'])) {
echo "<h2>Only logged in users may shorten links. Did you mean to <a href='login.php'>log in</a>?</h2>";
require_once('footer.php');
require_once('layout-footerlg.php');
die();
}
}
@ -160,4 +160,4 @@ else {
}
echo '<br><a href="index.php" class="btn btn-primary btn-large">Shorten Another Link</a></div>';
require_once('footer.php');
require_once('layout-footerlg.php');

View File

@ -5,16 +5,16 @@ if ($fpass == false) {
die('This service was disabled by the site owner. ');
}
require_once 'req.php'; // require core libs
require_once 'polrauth.php'; // require auth libs
require_once 'sgmail.php'; // require mail libs
require_once 'password.php'; // require password encryption libs
require_once 'lib-core.php'; // require core libs
require_once 'lib-auth.php'; // require auth libs
require_once 'helper-mailsend.php'; // require mail libs
require_once 'lib-password.php'; // require password encryption libs
require_once 'fpasslib.php'; // require fpass functions
// require_once('ayah.php');
$polrauth = new polrauth();
$fpass = new fpass();
require_once 'header.php';
require_once 'layout-headerlg.php';
if (isset($_POST['rnpass']) && isset($_POST['npass']) && isset($_POST['crkey']) && isset($_POST['cuser'])) {
// if submitting new pw
$ckey = $mysqli->real_escape_string($_POST['crkey']);
@ -26,29 +26,29 @@ if (isset($_POST['rnpass']) && isset($_POST['npass']) && isset($_POST['crkey'])
echo "<h2>That username is not associated with any account. Please try again.</h2>"
. "<br />"
. "<a href='forgotpass.php'>Back</a>";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die();
}
if ($userinfoc == false) {
// if user does not exist
require_once 'header.php';
require_once 'layout-headerlg.php';
echo "<h2>User or key invalid or already used.</h2>";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die();
}
if ($userinfoc['rkey'] == $_POST['crkey']) { // if rkey & user check out
if ($npass != $rnpass) {
// if new pass & repeat don't match
require_once 'header.php';
require_once 'layout-headerlg.php';
echo "<h2>Passwords don't match. Try again. (click the link in the email again)</h2>";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die();
} else { // all checks out
$fpass->changepass($npass, $cuser); // change pass
$polrauth->crkey($cuser); //change rkey
require_once 'header.php';
require_once 'layout-headerlg.php';
echo "<h2>Password changed.</h2>";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die();
}
}
@ -61,19 +61,19 @@ if (isset($_GET['key']) && isset($_GET['username'])) {
echo "<h2>That username is not associated with any account. Please try again.</h2>"
. "<br />"
. "<a href='forgotpass.php'>Back</a>";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die();
}
if ($userinfoc == false) {
// if user does not exist
require_once 'header.php';
require_once 'layout-headerlg.php';
echo "<h2>User or key invalid or already used.</h2>";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die();
}
//var_dump($userinfoc);
if ($userinfoc['rkey'] == $_GET['key']) {
require_once 'header.php';
require_once 'layout-headerlg.php';
echo "<h2>Change Password for {$_GET['username']}</h2>";
echo "<form action='forgotpass.php' method='POST' class='form-inline' role='form'>"
. "<input type='password' name='npass' id='npass' placeholder='New Password' style='width: 250px;' class='form-control' size='50'/>"
@ -84,7 +84,7 @@ if (isset($_GET['key']) && isset($_GET['username'])) {
. "<input type='submit' id='submit' class='form-control' style='width: 450px;' value='Change Password' />"
. "</form>";
echo "<script src='fpass.js'></script>";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die();
}
}
@ -101,7 +101,7 @@ if (!$email) {
. "<input type='text' class='form-control' style='width: 450px;' name='email' placeholder='Email...' /><br />"
. "<input type='submit' name='fpasssubmit' class='form-control' style='width: 450px;' value='Get a password reset email' />"
. "</form>";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die();
}
if (strlen($email) < 5) {
@ -111,7 +111,7 @@ if (strlen($email) < 5) {
. "<input type='text' name='email' placeholder='Email...' />"
. "<input type='submit' name='fpasssubmit' value='Get a password reset email' />"
. "</form>";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die();
}
$email = $mysqli->real_escape_string($_POST['email']);
@ -120,11 +120,11 @@ if ($userinfo == false) {
echo "<h2>That email is not associated with any account. Please try again.</h2>"
. "<br />"
. "<a href='forgotpass.php'>Back</a>";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die();
}
$rkey = $userinfo['rkey'];
$username = $userinfo['username'];
$fpass->sendfmail($email, $username, $rkey); // send the email
echo "Email successfully sent. Check your inbox for more info.";
require_once 'footer.php';
require_once 'layout-footerlg.php';

View File

@ -1,8 +1,8 @@
<?php
// includes for forgotpassword functions
require_once 'sgmail.php';
require_once 'polrauth.php';
require_once 'req.php';
require_once 'helper-mailsend.php';
require_once 'lib-auth.php';
require_once 'lib-core.php';
$polrauth = new polrauth();
$sgmail = new sgmail();
class fpass {

View File

@ -1,7 +1,7 @@
<?php
require_once('password.php'); //password hashing lib - crpypt forward compat
require_once('req.php');
require_once('polrauth.php');
require_once('lib-password.php'); //password hashing lib - crpypt forward compat
require_once('lib-core.php');
require_once('lib-auth.php');
$polrauth = new polrauth();
$authcreds['username'] = $mysqli->real_escape_string($_POST['username']);
$authcreds['password'] = $mysqli->real_escape_string($_POST['password']);
@ -19,11 +19,11 @@ if($authed==true) {
header('Location:index.php');
}
else {
require_once('header.php');
require_once('layout-headerlg.php');
echo '<h2>Incorrect password or username (or account not activated). Try again</h2><br />';
if ($fpass == true) {
echo '<a href="forgotpass.php">Forgot Password?</a><br />';
}
require_once('footer.php');
require_once('layout-footerlg.php');
die();
}

View File

@ -1,42 +1,42 @@
<?php
require_once('password.php'); //password hashing lib - crpypt forward compat
require_once('req.php');
require_once('sgmail.php');
require_once('lib-password.php'); //password hashing lib - crpypt forward compat
require_once('lib-core.php');
require_once('helper-mailsend.php');
$sgmail = new sgmail();
$isemail = filteremail($_POST['email']);
if (!$isemail) {
require_once 'header.php';
require_once 'layout-headerlg.php';
echo "Please enter a valid email. <br><br><a href='register.php'>Go Back</a>";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die(); //prevent user from registering
}
if ((strlen($_POST['username']) > 15) || (strlen($_POST['password']) > 25) || (strlen($_POST['email']) > 50)) {
require_once 'header.php';
require_once 'layout-headerlg.php';
echo "Your username must not be over 15 characters, password must be under 25 characters but over 6 characters, and email must be under 50 charcaters. <br><br><a href='register.php'>Go Back</a>";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die(); //prevent user from registering
}
if (strlen($_POST['username']) == 0 || strlen($_POST['password']) < 4 || strlen($_POST['email']) == 0) {
require_once 'header.php';
require_once 'layout-headerlg.php';
echo "Fields may not be left blank, password must be over 4 characters. <br><br><a href='register.php'>Go Back</a>";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die(); //prevent user from registering
}
if (!ctype_alnum($_POST['username'])) {
require_once 'header.php';
require_once 'layout-headerlg.php';
echo "Your username must be alphanumerical (numbers and letters only). <br><br><a href='register.php'>Go Back</a>";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die(); //prevent user from registering
}
/*
if ($_POST['tos']!='accept') {
require_once 'header.php';
require_once 'layout-headerlg.php';
echo "You must accept the <a href='tos.php'>Terms of Service</a> in order to register.<br><br><a href='register.php'>Go Back</a>";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die();
}
*/
@ -55,9 +55,9 @@ $ireg['3'] = sqlfetch('auth', 'valid', 'email', $reg['email']);
if (($ireg['1'] == true || $ireg['2'] == true) && $ireg['3'] == 1) {
require_once 'header.php';
require_once 'layout-headerlg.php';
echo "Username/email already in use. <br><br><a href='register.php'>Go Back</a>";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die(); //prevent user from registering
}
@ -94,14 +94,14 @@ if ($regtype == 'email') {
$sm = $sgmail->sendmail($to, 'Polr Account Validation', $sgmsg);
require_once 'header.php';
require_once 'layout-headerlg.php';
echo "Thanks for registering. Check your email for an activation link. You must activate your account before logging in (top right corner)";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die();
}
else {
require_once 'header.php';
require_once 'layout-headerlg.php';
echo "Thanks for registering. You may now login (top right corner)";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die();
}

View File

@ -1,5 +1,5 @@
<?php
require_once('req.php');
require_once('lib-core.php');
class ajaxhandler {
public function __construct() {
global $mysqli;

View File

@ -1,7 +1,7 @@
<?php
require_once('req.php');
require_once('ajaxhandler.php');
require_once('lib-core.php');
require_once('helper-ajax.php');
$ajaxhandler = new ajaxhandler();

View File

@ -1,6 +1,6 @@
<?php
require_once 'req.php';
require_once 'lib-core.php';
require 'vendor/PHPMailer/PHPMailerAutoload.php';
/*

View File

@ -28,7 +28,7 @@ if(!@include('config.php')) {
<link rel="stylesheet" href="css/main.css"/>
<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" rel="stylesheet">
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<script src="js/mpjs.js"></script>
<script src="js/index.js"></script>
<link rel="shortcut icon" href="favicon.ico">
<script src="//netdna.bootstrapcdn.com/bootstrap/3.3.0/js/bootstrap.min.js"></script>
<link rel="stylesheet" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/themes/smoothness/jquery-ui.css" />
@ -85,7 +85,7 @@ if(!@include('config.php')) {
<li><a href="about.php">About</a></li>
</ul>
<ul class="nav pull-right navbar-nav">
<?php include('polrauth.php');
<?php include('lib-auth.php');
$polrauth = new polrauth();
$polrauth->headblock(); ?>
<?php require_once('config.php'); if ($regtype != 'none'){ echo '<li><a href="register.php">Sign Up</a></li>';}?>
@ -94,7 +94,7 @@ if(!@include('config.php')) {
<a class="dropdown-toggle" href="#" data-toggle="dropdown">Sign In <strong class="caret"></strong></a>
<div class="dropdown-menu pull-right" id="dropdown" style="padding: 15px; padding-bottom: 0px;">
<h2>Login</h2>
<form action="loginproc.php" method="post" accept-charset="UTF-8">
<form action="handle-login.php" method="post" accept-charset="UTF-8">
<input id="user_username" style="margin-bottom: 15px;" type="text" name="username" placeholder='Username' size="30" class="form-control">
<input id="user_password" style="margin-bottom: 15px;" type="password" name="password" placeholder='Password' size="30" class="form-control">
<input class="btn btn-success form-control" style="clear: left; width: 100%; height: 32px; font-size: 13px;" type="submit" name="login" value="Sign In">

View File

@ -18,7 +18,7 @@ $(function() {
$('#checkavail').click(function() {
var customlink = $('#custom').val();
var request = $.ajax({
url: "linkcheck.php",
url: "helper-linkcheck.php",
type: "POST",
data: { link : customlink },
dataType: "html"

View File

@ -1,3 +1,7 @@
$(document).ready(function() {
$('#tabsb').tab();
});
function dodisable(baseval) {
//var baseval = $(this).attr('id');
var basevalr = baseval;

View File

@ -1,10 +0,0 @@
/*
$('#tabsb a[href="#home"]').tab('show');
$('#tabsb a[href="#links"]').tab('show');
$('#tabsb a[href="#messages"]').tab('show');
$('#tabsb a[href="#settings"]').tab('show');
$('#tabsb a[href="#adminpanel"]').tab('show');
*/
$(document).ready(function() {
$('#tabsb').tab();
});

View File

@ -3,7 +3,7 @@
<head>
<title><?php require_once('config.php');echo $wsn;?></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="<?php require_once('config.php');if (!$theme) {echo 'css/bootstrap.css';}else {echo $theme;}?>"/>
<link rel="stylesheet" href="<?php if (!$theme) {echo 'css/bootstrap.css';}else {echo $theme;}?>"/>
<link rel="stylesheet" href="css/main.css"/>
<link rel="shortcut icon" href="favicon.ico">
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
@ -26,7 +26,7 @@
</head>
<body style="padding-top:60px">
<div class="container-fluid">
<div class="navbar navbar-default navbar-fixed-top"><div class="navbar-header"><a class="navbar-brand" href="index.php"><?php require_once('config.php');echo $wsn;?></a></div>
<div class="navbar navbar-default navbar-fixed-top"><div class="navbar-header"><a class="navbar-brand" href="index.php"><?php echo $wsn;?></a></div>
<!--<a class="btn btn-navbar btn-default" data-toggle="collapse" data-target="#nbc">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
@ -38,17 +38,17 @@
</ul>
<ul class="nav pull-right navbar-nav">
<?php
require_once('polrauth.php');
require_once('lib-auth.php');
$polrauth = new polrauth();
$polrauth->headblock();
?>
<?php require_once('config.php'); if ($regtype != 'none'){ echo '<li><a href="register.php">Sign Up</a></li>';}?>
<?php if ($regtype != 'none'){ echo '<li><a href="register.php">Sign Up</a></li>';}?>
<li class="divider-vertical"></li>
<li class="dropdown pull-right">
<a class="dropdown-toggle" href="#" data-toggle="dropdown">Sign In <strong class="caret"></strong></a>
<div class="dropdown-menu" id="dropdown" style="padding: 15px; padding-bottom: 0px;">
<h2>Login</h2>
<form action="loginproc.php" method="post" accept-charset="UTF-8">
<form action="handle-login.php" method="post" accept-charset="UTF-8">
<input id="user_username" style="margin-bottom: 15px;" type="text" name="username" placeholder='Username' size="30" class="form-control">
<input id="user_password" style="margin-bottom: 15px;" type="password" name="password" placeholder='Password' size="30" class="form-control">

View File

@ -38,7 +38,7 @@
</ul>
<ul class="nav pull-right navbar-nav">
<?php
require_once('polrauth.php');
require_once('lib-auth.php');
$polrauth = new polrauth();
$polrauth->headblock();
?>
@ -48,7 +48,7 @@
<a class="dropdown-toggle" href="#" data-toggle="dropdown">Sign In <strong class="caret"></strong></a>
<div class="dropdown-menu" id="dropdown" style="padding: 15px; padding-bottom: 0px;">
<h2>Login</h2>
<form action="loginproc.php" method="post" accept-charset="UTF-8">
<form action="handle-login.php" method="post" accept-charset="UTF-8">
<input id="user_username" style="margin-bottom: 15px;" type="text" name="username" placeholder='Username' size="30" class="form-control">
<input id="user_password" style="margin-bottom: 15px;" type="password" name="password" placeholder='Password' size="30" class="form-control">

View File

@ -37,7 +37,7 @@
</ul>
<ul class="nav pull-right navbar-nav">
<?php
require_once('polrauth.php');
require_once('lib-auth.php');
$polrauth = new polrauth();
$polrauth->headblock();
?>
@ -47,7 +47,7 @@
<a class="dropdown-toggle" href="#" data-toggle="dropdown">Sign In <strong class="caret"></strong></a>
<div class="dropdown-menu" id="dropdown" style="padding: 15px; padding-bottom: 0px;">
<h2>Login</h2>
<form action="loginproc.php" method="post" accept-charset="UTF-8">
<form action="handle-login.php" method="post" accept-charset="UTF-8">
<input id="user_username" style="margin-bottom: 15px;" type="text" name="username" placeholder='Username' size="30" class="form-control">
<input id="user_password" style="margin-bottom: 15px;" type="password" name="password" placeholder='Password' size="30" class="form-control">

View File

@ -1,7 +1,7 @@
<?php
require_once('req.php'); //load config etc
require_once('password.php');
require_once('lib-core.php'); //load config etc
require_once('lib-password.php');
class polrauth {
@ -95,7 +95,7 @@ class polrauth {
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenu">
<li><a tabindex="-1" href="index.php">Dashboard</a></li>
<li><a tabindex="-1" href="index.php">Settings</a></li>
<li><a tabindex="-1" href="../logout.php">Logout</a></li>
<li><a tabindex="-1" href="logout.php">Logout</a></li>
</ul>
</li>
</div>';

View File

@ -1,11 +1,11 @@
<?php
require_once('polrauth.php');
require_once('lib-auth.php');
$polrauth = new polrauth();
if ($polrauth->islogged() != false) {
header("Location: ucp.php");
die();
}
require_once('headerpagenj.php');
require_once('layout-headersm.php');
echo '
@ -13,7 +13,7 @@ echo '
<h1>Login</h1><br/><br/>
<div class="col-md-2"></div>
<div class="col-md-8">
<form action="loginproc.php" method="POST"><b>Username:</b><br/>
<form action="handle-login.php" method="POST"><b>Username:</b><br/>
<input type="text" name="username" id="username" class="form-control"/><br/><b>Password:</b><br/>
<input type="password" name="password" id="password" class="form-control"/><br />
<input id="remember_me" style="padding-botton: 15px" type="checkbox" name="remember_me" value="remember_me" size="30" /> <b>Remember Me</b>
@ -23,4 +23,4 @@ echo '
</div>
<div class="col-md-2"></div>
</div>';
require_once('footer.php');
require_once('layout-footerlg.php');

10
r.php
View File

@ -1,6 +1,6 @@
<?php
//Polr Redirector Core
require_once('req.php');
require_once('lib-core.php');
if (is_string($_GET['u'])) {
$val = $mysqli->real_escape_string($_GET['u']);
} else {
@ -22,10 +22,10 @@ if (!$row['rurl']) {
header("Location: 404.php", true, 302);
}
if (strtolower($row['rurl']) == "disabled") {
require_once 'header.php';
require_once 'layout-headerlg.php';
echo "<h2>The link you are trying to reach has been disabled.</h2><br>"
. "Sorry for the inconvienience.";
require_once 'footer.php';
require_once 'layout-footerlg.php';
}
$lkey = @$row['lkey'];
if (strlen($lkey)>1) {
@ -35,9 +35,9 @@ if (strlen($lkey)>1) {
// yup, right key...continue on
}
else {
require_once('header.php');
require_once('layout-headerlg.php');
echo "Incorrect Key. (http://{$wsa}/abc?keyhere)";
require_once('footer.php');
require_once('layout-footerlg.php');
die();
}
}

View File

@ -2,15 +2,15 @@
/*
* Registration Page
*/
require_once('req.php');
require_once('headerpage.php');
require_once('lib-core.php');
require_once('layout-headermd.php');
echo "<h2 style='color:green'>Register</h2>";
echo "<form action='registerproc.php' method='POST'>"
echo "<form action='handle-register.php' method='POST'>"
. "<br>Username: <input type='text' name='username' class='form-control' placeholder='Username' />"
. "<br>Password: <input type='password' name='password' class='form-control' placeholder='Password' />"
. "<br>Email: <input type='email' name='email' class='form-control' placeholder='Email' />"
. "<br><input type=\"submit\" name=\"polrsubmit\" class=\"btn btn-default btn-warning\" value=\"Register\"/>";
require_once('footerpage.php');
require_once('layout-footermd.php');

View File

@ -17,7 +17,7 @@
<head>
<meta charset="UTF-8">
<title>Polr Setup</title>
<link rel="stylesheet" href="install-bootstrap.css"/>
<link rel="stylesheet" href="css/install-bootstrap.css"/>
</head>
<body style="padding-top:60px">
<div class="navbar navbar-default navbar-fixed-top">
@ -28,7 +28,7 @@
<?php
@(include('config.php'));
include ('version.php');
require_once 'password.php';
require_once 'lib-password.php';
date_default_timezone_set('UTC');
$mysqlnd = function_exists('mysqli_fetch_all');
@ -49,19 +49,19 @@
if (isset($ppass)) {
if (!isset($_POST['pw'])) {
require_once 'header.php';
require_once 'layout-headerlg.php';
echo "<h2>Enter setup password to proceed:</h2>";
echo "<form action='setup.php' method='post'><br><input class='form-control' type='password' name='pw' /><br><input type='submit' class='form-control' value='Log in' /></form>";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die();
} else if ($pwf = password_verify($_POST['pw'], $ppass)) {
echo "";
} else {
require_once 'header.php';
require_once 'layout-headerlg.php';
echo "Wrong password<br>";
echo "<h2>Enter setup password to proceed:</h2>";
echo "<form action='setup.php' method='post'><br><input type='password' class='form-control' name='pw' /><br><input type='submit' class='form-control' value='Log in' /></form>";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die();
}
}
@ -82,15 +82,15 @@
$nowdate = date('F d Y');
$data = '<?php
$host="' . $_POST['dbserver'] . '";' .
'$user="' . $_POST['dbuser'] . '";' .
'$passwd="' . $_POST['dbpass'] . '";' .
'$db="' . $_POST['dbname'] . '";' .
'$wsa = "' . $_POST['appurl'] . '";' .
'$wsn = "' . $_POST['appname'] . '";' .
'$wsb = "' . $nowdate . '";' .
'$ppass = \'' . hashpass($_POST['protpass']) . '\';' .
'$ip = $_SERVER[\'REMOTE_ADDR\'];'
. $host="' . $_POST['dbserver'] . '";'
. '$user="' . $_POST['dbuser'] . '";'
. '$passwd="' . $_POST['dbpass'] . '";'
. '$db="' . $_POST['dbname'] . '";'
. '$wsa = "' . $_POST['appurl'] . '";'
. '$wsn = "' . $_POST['appname'] . '";'
. '$wsb = "' . $nowdate . '";'
. '$ppass = \'' . hashpass($_POST['protpass']) . '\';'
. '$ip = $_SERVER[\'REMOTE_ADDR\'];'
. '$hp = "' . sha1(rstr(30)) . "\";"
. '$regtype = "' . $_POST['reg'] . "\";"
. '$path = "' . $_POST['path'] . "\";"
@ -121,7 +121,7 @@
}
echo "Successfully created config. ";
fclose($handle);
require_once('req.php');
require_once('lib-core.php');
$path = $_POST['path'];
if (strlen($path) > 2) {
$data = "<IfModule mod_rewrite.c>
@ -135,13 +135,12 @@
RewriteRule ^([a-zA-Z0-9]+)/?$ r.php?u=$1 [L,QSA]
RewriteRule ^t-([a-zA-Z0-9]+)/?$ r.php?u=t-$1 [L,QSA]
RewriteRule ^/?\+([a-zA-Z0-9]+)$ stats.php?bv=$1 [L,QSA]
</IfModule>
";
</IfModule>";
$handle = fopen('.htaccess', 'w');
if (fwrite($handle, $data) === FALSE) {
echo "Can not write to (" . $file . ")";
}
$data = "# Polr Custom **experimental** nginx configuration. Append this to your nginx config for effect.
$data = "# Polr **experimental** nginx configuration. Append this to your nginx config for effect.
# If you use Apache, ignore this file.
# Try `/etc/nginx/config.d/` if you have trouble finding the configuration
server {
@ -152,7 +151,7 @@
rewrite ^(.*)$ $path/api.php;
}
location $path/ {
if (!-e $request_filename){
if (!-e \$request_filename){
rewrite ^$path/([a-zA-Z0-9]+)\?([a-zA-Z0-9]+)$ $path/r.php?u=$1&lkey=$2;
}
rewrite ^$path/([a-zA-Z0-9]+)/?$ $path/r.php?u=$1;
@ -265,7 +264,7 @@
// App Config
echo "<br /><b style=\"text-align:center\">Application Settings</b><br />";
echo "Application Name: <input type=\"text\" class='form-control' style='width:650px' name=\"appname\" value=\"polr\"><br>";
echo "Application Name: <input type=\"text\" class='form-control' style='width:650px' name=\"appname\" value=\"Polr\"><br>";
echo "Application URL (path to Polr, no http://, www., or trailing slash) : <input type=\"text\" style='width:650px' class='form-control' name=\"appurl\" value=\"yoursite.com\"><br>";
echo "Fetch ip through variable: <input type=\"text\" class='form-control' style='width:650px' name=\"ipfetch\" value=\"\$_SERVER['REMOTE_ADDR']\"><br>";
echo "Shortening Permissions: <select name='li_shorten_only' style='width:650px' class='form-control'>"
@ -296,7 +295,7 @@
. "</select><br /><br />";
echo "Password Recovery: <select name='fpass' style='width:650px' class='form-control'>"
. "<option value='false'>No (default)</option>"
. "<option value='true'>Yes (could cause problems unless sgmail.php/email is properly set up)</option>"
. "<option value='true'>Yes (could cause problems unless helper-mailsend.php/email is properly set up)</option>"
. "</select><br /><br />";
echo "Path relative to root (leave blank if /, if http://site.com/polr, then write /polr/): <input type=\"text\" class='form-control' style='width:650px' name=\"path\" value=\"/polr/\"><br>";
echo "Theme (choose wisely, click <a href='https://github.com/Cydrobolt/polr/wiki/Themes-Screenshots'>here</a> for screenshots: <select name='t' style='width:650px' class='form-control'>"

View File

@ -1,10 +1,10 @@
<?php
require_once 'header.php';
require_once 'layout-headerlg.php';
if (is_string($_GET['bv']) && ctype_alnum($_GET['bv'])) {
$bv = $mysqli->real_escape_string($_GET['bv']);
} else {
echo "<h2>You attempted to show stats for a link that does not exist, or you are formatting your link wrong.</h2>";
require_once 'footer.php';
require_once 'layout-footerlg.php';
die();
}
$query = "SELECT `clicks`,`country`,`rurl` FROM redirinfo WHERE baseval='{$bv}';";
@ -12,7 +12,7 @@ $result = $mysqli->query($query);
$row = mysqli_fetch_assoc($result);
if(!$row) {
echo "404 Not Found";
require_once 'footer.php';die();
require_once 'layout-footerlg.php';die();
}
if(!$row['user']) {
@ -28,4 +28,4 @@ echo "<div class='col-md-4'><h2>Clicks</h2><span style='color:blue'>{$row['click
echo "<div class='col-md-4'><h2>Created by</h2><span style='color:red'>{$row['user']}</span></div>";
echo "<div class='col-md-4'><h2>Country</h2><span style='color:grey'>{$row['country']}</span></div>";
require_once 'footer.php';
require_once 'layout-footerlg.php';

View File

@ -1,5 +1,5 @@
<?php
require_once('req.php');
require_once('lib-core.php');
echo var_dump($mysqli);

View File

@ -1,4 +1,4 @@
<?php
$version = "1.3.0 Stable: Raring Turtle";
$version = "1.3.2 Unstable: Raring Turtle";
$reldate = "Dec 03 2014";
$relyear = 2014;