Skip to content

Declare all methods in WPOTools class to be static. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DArcMattr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Declare all methods in WPOTools class to be static. #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
132 changes: 66 additions & 66 deletions inc/tools.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

class WPOTools {
class WPOTools {

function pick()
static function pick()
{
$argc = func_num_args();
for ($i = 0; $i < $argc; $i++) {
Expand All @@ -12,35 +12,35 @@ function pick()
}
}

return null;
return null;
}
function getOptions($args)

static function getOptions($args)
{
if (is_array($args))
$r = &$args;
else
parse_str($args, $r);

return $r;
}
function isAjax() {
return isset($_SERVER['HTTP_X_REQUESTED_WITH']) && ($_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest');

static function isAjax() {
return isset($_SERVER['HTTP_X_REQUESTED_WITH']) && ($_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest');
}
function isUnix()

static function isUnix()
{
return in_array(php_uname('s'), array('Linux', 'FreeBSD', 'OpenBSD', 'Darwin', 'SunOS', 'AIX'));
}
}

// from Pear System::which, released under the PHP License
// http://www.php.net/license/3_0.txt
// slightly modified
function getBinaryPath($program, $append = '', $fallback = null)
{
static function getBinaryPath($program, $append = '', $fallback = null)
{
$win = substr(PHP_OS, 0, 3) == 'WIN';

// enforce API
if (!is_string($program) || '' == $program) {
return $fallback;
Expand Down Expand Up @@ -92,12 +92,12 @@ function getBinaryPath($program, $append = '', $fallback = null)
}
return $fallback;
}
function getQueryArgs($args, $defaults = array())
{
$r = WPOTools::getOptions($args);

static function getQueryArgs($args, $defaults = array())
{
$r = WPOTools::getOptions($args);
$ret = array_merge($defaults, $r);

if(isset($ret['page']) && $ret['page'] && isset($ret['perpage']) && $ret['perpage'])
{
$perpage = $ret['perpage'];
Expand All @@ -108,78 +108,78 @@ function getQueryArgs($args, $defaults = array())
$end = $start + $perpage;
$ret['limit'] = "{$start}, {$end}";
}

if(isset($ret['where']) && $ret['where'])
$ret['where'] = ' AND ' . $ret['where'];

if(isset($ret['limit']) && $ret['limit'])
$ret['limit'] = 'LIMIT ' . $ret['limit'];
$ret['limit'] = 'LIMIT ' . $ret['limit'];

return $ret;
}
function insertQuery($table, $params)

static function insertQuery($table, $params)
{
$fields = array_keys($params);
return "INSERT INTO $table (".implode(', ',$fields).") VALUES ('".implode("','",$params)."')" ;
}
function updateQuery($table, $params, $where)

static function updateQuery($table, $params, $where)
{
$bits = array();
foreach(array_keys($params) as $k )
$bits[] = "{$table}.{$k}='$params[$k]'";
return "UPDATE $table SET ".implode(', ',$bits)." WHERE $where";
}
function addOptions($options)

static function addOptions($options)
{
foreach($options as $option => $vars)
add_option($option, $vars[0], $vars[1], (isset($vars[2])) ? $vars[2] : null);
}
function addMissingOptions($options)
add_option($option, $vars[0], $vars[1], (isset($vars[2])) ? $vars[2] : null);
}

static function addMissingOptions($options)
{
$opt = array();

foreach($options as $option => $vars)
if(! get_option($option)) $opt[$option] = $vars;

return count($opt) ? WPOTools::addOptions($opt) : true;
}
function deleteOptions($options)

static function deleteOptions($options)
{
foreach($options as $option)
delete_option($option);
}
function parseImages($text)
{

static function parseImages($text)
{
preg_match_all('/<img(.+?)src=\"(.+?)\"(.*?)>/', $text, $out);
return $out;
}
function stripText($text)

static function stripText($text)
{
$text = strtolower($text);

// strip all non word chars
$text = preg_replace('/\W/', ' ', $text);

// replace all white space sections with a dash
$text = preg_replace('/\ +/', '-', $text);

// trim dashes
$text = preg_replace('/\-$/', '', $text);
$text = preg_replace('/^\-/', '', $text);

return $text;
}

// from somewhere in the internet.. too lazy to do it myself
// @todo add right copyright
function calcTime($t, $sT = 0, $sel = 'Y', $includenull = true) {
static function calcTime($t, $sT = 0, $sel = 'Y', $includenull = true) {

$sY = 31536000;
$sW = 604800;
Expand Down Expand Up @@ -241,8 +241,8 @@ function calcTime($t, $sT = 0, $sel = 'Y', $includenull = true) {

return $r;
}
function stringToArray($string)

static function stringToArray($string)
{
preg_match_all('/
\s*(\w+) # key \\1
Expand All @@ -263,14 +263,14 @@ function stringToArray($string)

return $attributes;
}

/**
* Finds the type of the passed value, returns the value as the new type.
*
* @param string
* @return mixed
*/
function literalize($value, $quoted = false)
static function literalize($value, $quoted = false)
{
// lowercase our value for comparison
$value = trim($value);
Expand Down Expand Up @@ -306,8 +306,8 @@ function literalize($value, $quoted = false)

return $value;
}
function tryThese()

static function tryThese()
{
$num = func_num_args();
for($i = 0; $i < $num; $i++)
Expand All @@ -316,8 +316,8 @@ function tryThese()
return func_get_arg($i);
}
}
function every()

static function every()
{
$num = func_num_args();
for($i = 0; $i < $num; $i++)
Expand All @@ -327,19 +327,19 @@ function every()
}
return true;
}
function timezoneMysql($format, $time)

static function timezoneMysql($format, $time)
{
return mysql2date($format, get_date_from_gmt($time));
return mysql2date($format, get_date_from_gmt($time));
}

}

// thanks php.net
if ( !function_exists('file_put_contents') && !defined('FILE_APPEND') )
if ( !function_exists('file_put_contents') && !defined('FILE_APPEND') )
{
define('FILE_APPEND', 1);
function file_put_contents($n, $d, $flag = false)
function file_put_contents($n, $d, $flag = false)
{
$mode = ($flag == FILE_APPEND || strtoupper($flag) == 'FILE_APPEND') ? 'a' : 'w';
$f = @fopen($n, $mode);
Expand All @@ -356,12 +356,12 @@ function file_put_contents($n, $d, $flag = false)

if(!function_exists('str_ireplace'))
{
function str_Ireplace($search, $replace, $subject)
function str_Ireplace($search, $replace, $subject)
{
if (is_array($search))
foreach ($search as $word) $words[] = "/".$word."/i";
else
$words = "/".$search."/i";
return preg_replace($words, $replace, $subject);
}
}
}