Browse Source

Merge pull request #24 from Teknikode/master

Develop catch-up
development
Teknikode 4 years ago
parent
commit
4133020abd
4 changed files with 11 additions and 8 deletions
  1. 3
    1
      about/main.php
  2. 1
    2
      includes/common.php
  3. 5
    3
      privacy/main.php
  4. 2
    2
      templates/default/footer.php

+ 3
- 1
about/main.php View File

@@ -75,7 +75,9 @@
<input type="text" class="form-control" name="bitcoin_address" value="<?php echo $CONF['bitcoin_address']; ?>" readonly>
</div>
<br />
PayPal Address: <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MBG93VKQ343P4">admin@teknik.io</a>
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MBG93VKQ343P4">
<button type="button" class="btn btn-default">Paypal Donation</button>
</a>
</p>
</p>
</div>

+ 1
- 2
includes/common.php View File

@@ -174,8 +174,7 @@ function upload($files, $CONF, $db)
if (!empty($files)) {
$filesize = filesize($files['file']['tmp_name']);
$file_type = mime_content_type($files['file']['tmp_name']);
//$ext = pathinfo($files['file']['name'], PATHINFO_EXTENSION);
$ext = substr($files['file']['name'], strrpos($files['file']['name'], '.')+1);
$ext = pathinfo($files['file']['name'], PATHINFO_EXTENSION);
if ($logged_in == 1)
{
$user_id = $user->id;

+ 5
- 3
privacy/main.php View File

@@ -7,9 +7,10 @@
</p>
<ul>
<li>Email Address (username@teknik.io)</li>
<li>Blog Posts</li>
<li>Published Blog Posts</li>
<li>Comments</li>
<li>Uploads (Only accessible by direct link)</li>
<li>Git commits</li>
<li>Git Repositories</li>
<li>Pastes without passwords</li>
<li>User Profile</li>
<ul>
@@ -42,7 +43,8 @@
<ul>
<li><var>PHPSESSION</var> - Used by PHP for the server-side code that is ran.</li>
<li><var>auth</var> - Used to authenticate a persistent login (activated when you choose 'remember me' at login).</li>
<li><var>_ga, _pk_id, _pk_ref, piwik_auth</var> - Used as an identifier for site statistics. This can be disabled through the user profile.</li>
</ul>
</div>
</div>
</div>
</div>

+ 2
- 2
templates/default/footer.php View File

@@ -1,7 +1,7 @@
</div>
<footer id="footer" class="footer navbar navbar-default">
<div class="container">
<p class="text-muted">&copy; Teknik 2013-2014 | <a href="<?php echo get_page_url("privacy", $CONF); ?>">Privacy</a> | <a href="<?php echo get_page_url("transparency", $CONF); ?>">Transparency</a> | <a href="<?php echo get_page_url("server", $CONF); ?>">Server</a></p>
<p class="text-muted">&copy; Teknik 2013-2015 | <a href="<?php echo get_page_url("privacy", $CONF); ?>">Privacy</a> | <a href="<?php echo get_page_url("transparency", $CONF); ?>">Transparency</a> | <a href="<?php echo get_page_url("server", $CONF); ?>">Server</a></p>
</div>
</footer>
@@ -24,4 +24,4 @@
<noscript><p><img src="//stats.teknik.io/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
<!-- End Piwik Code -->
</body>
</html>
</html>

Loading…
Cancel
Save