* easily as email does today.
*/
-require_once('include/autoloader.php');
+require_once(__DIR__ . DIRECTORY_SEPARATOR. 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php');
use \Friendica\Core\Config;
require_once('include/pgettext.php');
require_once('include/nav.php');
require_once('include/cache.php');
-require_once('library/Mobile_Detect/Mobile_Detect.php');
require_once('include/features.php');
require_once('include/identity.php');
-require_once('include/pidfile.php');
require_once('update.php');
require_once('include/dbstructure.php');
define ( 'FRIENDICA_CODENAME', 'Asparagus');
define ( 'FRIENDICA_VERSION', '3.5.2-dev' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
-define ( 'DB_UPDATE_VERSION', 1215 );
+define ( 'DB_UPDATE_VERSION', 1219 );
/**
* @brief Constant with a HTML line break.
* and existing allocations MUST NEVER BE CHANGED
* OR RE-ASSIGNED! You may only add to them.
*/
-
$netgroup_ids = array(
NETWORK_DFRN => (-1),
NETWORK_ZOT => (-2),
define ( 'ACTIVITY_TAG', NAMESPACE_ACTIVITY_SCHEMA . 'tag' );
define ( 'ACTIVITY_FAVORITE', NAMESPACE_ACTIVITY_SCHEMA . 'favorite' );
define ( 'ACTIVITY_SHARE', NAMESPACE_ACTIVITY_SCHEMA . 'share' );
+define ( 'ACTIVITY_DELETE', NAMESPACE_ACTIVITY_SCHEMA . 'delete' );
define ( 'ACTIVITY_POKE', NAMESPACE_ZOT . '/activity/poke' );
define ( 'ACTIVITY_MOOD', NAMESPACE_ZOT . '/activity/mood' );
define('SR_SCOPE_TAGS', 'tags');
/* @}*/
+/**
+ * Lowest possible date time value
+ */
+
+define ('NULL_DATE', '0001-01-01 00:00:00');
+
+
// Normally this constant is defined - but not if "pcntl" isn't installed
-if (!defined("SIGTERM"))
+if (!defined("SIGTERM")) {
define("SIGTERM", 15);
-
+}
/**
*
* Reverse the effect of magic_quotes_gpc if it is enabled.
*/
class App {
+ /// @TODO decide indending as a colorful mixure is ahead ...
public $module_loaded = false;
public $query_string;
public $config;
* beyond are used.
*/
public $theme = array(
- 'sourcename' => '',
- 'videowidth' => 425,
- 'videoheight' => 350,
+ 'sourcename' => '',
+ 'videowidth' => 425,
+ 'videoheight' => 350,
'force_max_items' => 0,
- 'thread_allow' => true,
- 'stylesheet' => '',
+ 'thread_allow' => true,
+ 'stylesheet' => '',
'template_engine' => 'smarty3',
);
$hostname = "";
- if (file_exists(".htpreconfig.php"))
- @include(".htpreconfig.php");
+ if (file_exists(".htpreconfig.php")) {
+ include ".htpreconfig.php";
+ }
$this->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC');
startup();
set_include_path(
- 'include' . PATH_SEPARATOR
+ get_include_path() . PATH_SEPARATOR
+ . 'include' . PATH_SEPARATOR
. 'library' . PATH_SEPARATOR
- . 'library/phpsec' . PATH_SEPARATOR
. 'library/langdet' . PATH_SEPARATOR
. '.' );
-
$this->scheme = 'http';
- if((x($_SERVER,'HTTPS') && $_SERVER['HTTPS']) ||
- (x($_SERVER['HTTP_FORWARDED']) && preg_match("/proto=https/", $_SERVER['HTTP_FORWARDED'])) ||
- (x($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') ||
- (x($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') ||
- (x($_SERVER['FRONT_END_HTTPS']) && $_SERVER['FRONT_END_HTTPS'] == 'on') ||
- (x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) // XXX: reasonable assumption, but isn't this hardcoding too much?
- ) {
+
+ if ((x($_SERVER, 'HTTPS') && $_SERVER['HTTPS']) ||
+ (x($_SERVER, 'HTTP_FORWARDED') && preg_match("/proto=https/", $_SERVER['HTTP_FORWARDED'])) ||
+ (x($_SERVER, 'HTTP_X_FORWARDED_PROTO') && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') ||
+ (x($_SERVER, 'HTTP_X_FORWARDED_SSL') && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') ||
+ (x($_SERVER, 'FRONT_END_HTTPS') && $_SERVER['FRONT_END_HTTPS'] == 'on') ||
+ (x($_SERVER, 'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) // XXX: reasonable assumption, but isn't this hardcoding too much?
+ ) {
$this->scheme = 'https';
- }
+ }
- if(x($_SERVER,'SERVER_NAME')) {
+ if (x($_SERVER, 'SERVER_NAME')) {
$this->hostname = $_SERVER['SERVER_NAME'];
- if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
+ if (x($_SERVER, 'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) {
$this->hostname .= ':' . $_SERVER['SERVER_PORT'];
+ }
/*
* Figure out if we are running at the top of a domain
* or in a sub-directory and adjust accordingly
*/
- $path = trim(dirname($_SERVER['SCRIPT_NAME']),'/\\');
- if(isset($path) && strlen($path) && ($path != $this->path))
+ /// @TODO This kind of escaping breaks syntax-highlightning on CoolEdit (Midnight Commander)
+ $path = trim(dirname($_SERVER['SCRIPT_NAME']), '/\\');
+ if (isset($path) && strlen($path) && ($path != $this->path)) {
$this->path = $path;
+ }
}
- if ($hostname != "")
+ if ($hostname != "") {
$this->hostname = $hostname;
+ }
- if (is_array($_SERVER["argv"]) && $_SERVER["argc"]>1 && substr(end($_SERVER["argv"]), 0, 4)=="http" ) {
- $this->set_baseurl(array_pop($_SERVER["argv"]) );
+ if (is_array($_SERVER["argv"]) && $_SERVER["argc"] > 1 && substr(end($_SERVER["argv"]), 0, 4) == "http" ) {
+ $this->set_baseurl(array_pop($_SERVER["argv"]));
$_SERVER["argc"] --;
}
- #set_include_path("include/$this->hostname" . PATH_SEPARATOR . get_include_path());
+ if ((x($_SERVER, 'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'], 0, 9) === "pagename=") {
+ $this->query_string = substr($_SERVER['QUERY_STRING'], 9);
- if ((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,9) === "pagename=") {
- $this->query_string = substr($_SERVER['QUERY_STRING'],9);
// removing trailing / - maybe a nginx problem
- if (substr($this->query_string, 0, 1) == "/")
- $this->query_string = substr($this->query_string, 1);
- } elseif ((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=") {
- $this->query_string = substr($_SERVER['QUERY_STRING'],2);
+ $this->query_string = ltrim($this->query_string, '/');
+ } elseif ((x($_SERVER, 'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'], 0, 2) === "q=") {
+ $this->query_string = substr($_SERVER['QUERY_STRING'], 2);
+
// removing trailing / - maybe a nginx problem
- if (substr($this->query_string, 0, 1) == "/")
- $this->query_string = substr($this->query_string, 1);
+ $this->query_string = ltrim($this->query_string, '/');
}
- if (x($_GET,'pagename')) {
- $this->cmd = trim($_GET['pagename'],'/\\');
- } elseif (x($_GET,'q')) {
- $this->cmd = trim($_GET['q'],'/\\');
+ if (x($_GET, 'pagename')) {
+ $this->cmd = trim($_GET['pagename'], '/\\');
+ } elseif (x($_GET, 'q')) {
+ $this->cmd = trim($_GET['q'], '/\\');
}
// fix query_string
- $this->query_string = str_replace($this->cmd."&",$this->cmd."?", $this->query_string);
-
+ $this->query_string = str_replace($this->cmd . "&", $this->cmd . "?", $this->query_string);
// unix style "homedir"
-
- if (substr($this->cmd,0,1) === '~') {
- $this->cmd = 'profile/' . substr($this->cmd,1);
+ if (substr($this->cmd, 0, 1) === '~') {
+ $this->cmd = 'profile/' . substr($this->cmd, 1);
}
// Diaspora style profile url
-
- if (substr($this->cmd,0,2) === 'u/') {
- $this->cmd = 'profile/' . substr($this->cmd,2);
+ if (substr($this->cmd, 0, 2) === 'u/') {
+ $this->cmd = 'profile/' . substr($this->cmd, 2);
}
/*
- *
* Break the URL path into C style argc/argv style arguments for our
* modules. Given "http://example.com/module/arg1/arg2", $this->argc
* will be 3 (integer) and $this->argv will contain:
*
* There will always be one argument. If provided a naked domain
* URL, $this->argv[0] is set to "home".
- *
*/
- $this->argv = explode('/',$this->cmd);
+ $this->argv = explode('/', $this->cmd);
$this->argc = count($this->argv);
- if((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) {
+ if ((array_key_exists('0', $this->argv)) && strlen($this->argv[0])) {
$this->module = str_replace(".", "_", $this->argv[0]);
$this->module = str_replace("-", "_", $this->module);
- }
- else {
+ } else {
$this->argc = 1;
$this->argv = array('home');
$this->module = 'home';
* pagination
*/
- $this->pager['page'] = ((x($_GET,'page') && intval($_GET['page']) > 0) ? intval($_GET['page']) : 1);
+ $this->pager['page'] = ((x($_GET, 'page') && intval($_GET['page']) > 0) ? intval($_GET['page']) : 1);
$this->pager['itemspage'] = 50;
$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
- if($this->pager['start'] < 0)
+
+ if ($this->pager['start'] < 0) {
$this->pager['start'] = 0;
+ }
$this->pager['total'] = 0;
/*
$basepath = get_config("system", "basepath");
- if ($basepath == "")
+ if ($basepath == "") {
$basepath = dirname(__FILE__);
+ }
- if ($basepath == "")
+ if ($basepath == "") {
$basepath = $_SERVER["DOCUMENT_ROOT"];
+ }
- if ($basepath == "")
+ if ($basepath == "") {
$basepath = $_SERVER["PWD"];
+ }
- return($basepath);
+ return $basepath;
}
function get_scheme() {
- return($this->scheme);
+ return $this->scheme;
}
/**
function set_baseurl($url) {
$parsed = @parse_url($url);
- if($parsed) {
+ if ($parsed) {
$this->scheme = $parsed['scheme'];
$hostname = $parsed['host'];
}
if (file_exists(".htpreconfig.php")) {
- @include(".htpreconfig.php");
+ include ".htpreconfig.php";
}
if (get_config('config', 'hostname') != '') {
}
function get_hostname() {
- if (get_config('config','hostname') != "")
- $this->hostname = get_config('config','hostname');
+ if (get_config('config', 'hostname') != "") {
+ $this->hostname = get_config('config', 'hostname');
+ }
return $this->hostname;
}
}
function set_path($p) {
- $this->path = trim(trim($p),'/');
+ $this->path = trim(trim($p), '/');
}
function get_path() {
$interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000);
// If the update is "deactivated" set it to the highest integer number (~24 days)
- if ($interval < 0)
+ if ($interval < 0) {
$interval = 2147483647;
+ }
- if($interval < 10000)
+ if ($interval < 10000) {
$interval = 40000;
+ }
// compose the page title from the sitename and the
// current module called
- if (!$this->module=='')
- {
- $this->page['title'] = $this->config['sitename'].' ('.$this->module.')';
+ if (!$this->module == '') {
+ $this->page['title'] = $this->config['sitename'] . ' (' . $this->module . ')';
} else {
- $this->page['title'] = $this->config['sitename'];
+ $this->page['title'] = $this->config['sitename'];
}
/* put the head template at the beginning of page['htmlhead']
* since the code added by the modules frequently depends on it
* being first
*/
- if(!isset($this->page['htmlhead']))
+ if (!isset($this->page['htmlhead'])) {
$this->page['htmlhead'] = '';
+ }
// If we're using Smarty, then doing replace_macros() will replace
// any unrecognized variables with a blank string. Since we delay
// replacing $stylesheet until later, we need to replace it now
// with another variable name
- if($this->theme['template_engine'] === 'smarty3')
+ if ($this->theme['template_engine'] === 'smarty3') {
$stylesheet = $this->get_template_ldelim('smarty3') . '$stylesheet' . $this->get_template_rdelim('smarty3');
- else
+ } else {
$stylesheet = '$stylesheet';
+ }
$shortcut_icon = get_config("system", "shortcut_icon");
- if ($shortcut_icon == "")
+ if ($shortcut_icon == "") {
$shortcut_icon = "images/friendica-32.png";
+ }
$touch_icon = get_config("system", "touch_icon");
- if ($touch_icon == "")
+ if ($touch_icon == "") {
$touch_icon = "images/friendica-128.png";
+ }
// get data wich is needed for infinite scroll on the network page
$invinite_scroll = infinite_scroll_data($this->module);
}
function init_page_end() {
- if(!isset($this->page['end']))
+ if (!isset($this->page['end'])) {
$this->page['end'] = '';
+ }
$tpl = get_markup_template('end.tpl');
$this->page['end'] = replace_macros($tpl,array(
'$baseurl' => $this->get_baseurl() // FIXME for z_path!!!!
function get_cached_avatar_image($avatar_image){
return $avatar_image;
-
- // The following code is deactivated. It doesn't seem to make any sense and it slows down the system.
- /*
- if($this->cached_profile_image[$avatar_image])
- return $this->cached_profile_image[$avatar_image];
-
- $path_parts = explode("/",$avatar_image);
- $common_filename = $path_parts[count($path_parts)-1];
-
- if($this->cached_profile_picdate[$common_filename]){
- $this->cached_profile_image[$avatar_image] = $avatar_image . $this->cached_profile_picdate[$common_filename];
- } else {
- $r = q("SELECT `contact`.`avatar-date` AS picdate FROM `contact` WHERE `contact`.`thumb` like '%%/%s'",
- $common_filename);
- if (! dbm::is_result($r)) {
- $this->cached_profile_image[$avatar_image] = $avatar_image;
- } else {
- $this->cached_profile_picdate[$common_filename] = "?rev=".urlencode($r[0]['picdate']);
- $this->cached_profile_image[$avatar_image] = $avatar_image.$this->cached_profile_picdate[$common_filename];
- }
- }
- return $this->cached_profile_image[$avatar_image];
- */
}
// Is the function called statically?
if (!(isset($this) && get_class($this) == __CLASS__)) {
- return(self::$a->remove_baseurl($orig_url));
+ return self::$a->remove_baseurl($orig_url);
}
// Remove the hostname from the url if it is an internal link
* @param string $name
*/
function register_template_engine($class, $name = '') {
- if ($name===""){
+ /// @TODO Really === and not just == ?
+ if ($name === "") {
$v = get_class_vars( $class );
- if(x($v,"name")) $name = $v['name'];
+ if (x($v,"name")) $name = $v['name'];
}
- if ($name===""){
+ if ($name === "") {
echo "template engine <tt>$class</tt> cannot be registered without a name.\n";
killme();
}
* @param strin $name Template engine name
* @return object Template Engine instance
*/
- function template_engine($name = ''){
- if ($name!=="") {
+ function template_engine($name = '') {
+ /// @TODO really type-check included?
+ if ($name !== "") {
$template_engine = $name;
} else {
$template_engine = 'smarty3';
}
if (isset($this->template_engines[$template_engine])){
- if(isset($this->template_engine_instance[$template_engine])){
+ if (isset($this->template_engine_instance[$template_engine])){
return $this->template_engine_instance[$template_engine];
} else {
$class = $this->template_engines[$template_engine];
function set_template_engine($engine = 'smarty3') {
$this->theme['template_engine'] = $engine;
- /*
- $this->theme['template_engine'] = 'smarty3';
-
- switch($engine) {
- case 'smarty3':
- if(is_writable('view/smarty3/'))
- $this->theme['template_engine'] = 'smarty3';
- break;
- default:
- break;
- }
- */
}
function get_template_ldelim($engine = 'smarty3') {
}
function save_timestamp($stamp, $value) {
- if (!isset($this->config['system']['profiler']) || !$this->config['system']['profiler'])
+ if (!isset($this->config['system']['profiler']) || !$this->config['system']['profiler']) {
return;
+ }
$duration = (float)(microtime(true)-$stamp);
array_shift($trace);
$callstack = array();
- foreach ($trace AS $func)
+ foreach ($trace AS $func) {
$callstack[] = $func["function"];
+ }
return implode(", ", $callstack);
}
function get_useragent() {
- return(FRIENDICA_PLATFORM." '".FRIENDICA_CODENAME."' ".FRIENDICA_VERSION."-".DB_UPDATE_VERSION."; ".$this->get_baseurl());
+ return
+ FRIENDICA_PLATFORM . " '" .
+ FRIENDICA_CODENAME . "' " .
+ FRIENDICA_VERSION . "-" .
+ DB_UPDATE_VERSION . "; " .
+ $this->get_baseurl();
}
function is_friendica_app() {
- return($this->is_friendica_app);
+ return $this->is_friendica_app;
}
/**
* @return bool Is it a known backend?
*/
function is_backend() {
- $backend = array();
- $backend[] = "_well_known";
- $backend[] = "api";
- $backend[] = "dfrn_notify";
- $backend[] = "fetch";
- $backend[] = "hcard";
- $backend[] = "hostxrd";
- $backend[] = "nodeinfo";
- $backend[] = "noscrape";
- $backend[] = "p";
- $backend[] = "poco";
- $backend[] = "post";
- $backend[] = "proxy";
- $backend[] = "pubsub";
- $backend[] = "pubsubhubbub";
- $backend[] = "receive";
- $backend[] = "rsd_xml";
- $backend[] = "salmon";
- $backend[] = "statistics_json";
- $backend[] = "xrd";
-
- if (in_array($this->module, $backend))
- return(true);
- else
- return($this->backend);
+ static $backends = array();
+ $backends[] = "_well_known";
+ $backends[] = "api";
+ $backends[] = "dfrn_notify";
+ $backends[] = "fetch";
+ $backends[] = "hcard";
+ $backends[] = "hostxrd";
+ $backends[] = "nodeinfo";
+ $backends[] = "noscrape";
+ $backends[] = "p";
+ $backends[] = "poco";
+ $backends[] = "post";
+ $backends[] = "proxy";
+ $backends[] = "pubsub";
+ $backends[] = "pubsubhubbub";
+ $backends[] = "receive";
+ $backends[] = "rsd_xml";
+ $backends[] = "salmon";
+ $backends[] = "statistics_json";
+ $backends[] = "xrd";
+
+ // Check if current module is in backend or backend flag is set
+ return (in_array($this->module, $backends) || $this->backend);
}
/**
if ($this->is_backend()) {
$process = "backend";
$max_processes = get_config('system', 'max_processes_backend');
- if (intval($max_processes) == 0)
+ if (intval($max_processes) == 0) {
$max_processes = 5;
+ }
} else {
$process = "frontend";
$max_processes = get_config('system', 'max_processes_frontend');
- if (intval($max_processes) == 0)
+ if (intval($max_processes) == 0) {
$max_processes = 20;
+ }
}
$processlist = dbm::processlist();
if ($this->is_backend()) {
$process = "backend";
$maxsysload = intval(get_config('system', 'maxloadavg'));
- if ($maxsysload < 1)
+ if ($maxsysload < 1) {
$maxsysload = 50;
+ }
} else {
$process = "frontend";
$maxsysload = intval(get_config('system','maxloadavg_frontend'));
- if ($maxsysload < 1)
+ if ($maxsysload < 1) {
$maxsysload = 50;
+ }
}
$load = current_load();
return false;
}
- /**
- * @brief Checks if the process is already running
- *
- * @param string $taskname The name of the task that will be used for the name of the lockfile
- * @param string $task The path and name of the php script
- * @param int $timeout The timeout after which a task should be killed
- *
- * @return bool Is the process running?
- */
- function is_already_running($taskname, $task = "", $timeout = 540) {
-
- $lockpath = get_lockpath();
- if ($lockpath != '') {
- $pidfile = new pidfile($lockpath, $taskname);
- if ($pidfile->is_already_running()) {
- logger("Already running");
- if ($pidfile->running_time() > $timeout) {
- $pidfile->kill();
- logger("killed stale process");
- // Calling a new instance
- if ($task != "")
- proc_run(PRIORITY_MEDIUM, $task);
- }
- return true;
- }
- }
- return false;
- }
-
function proc_run($args) {
if (!function_exists("proc_open")) {
return;
}
- // Add the php path if it is a php call
- if (count($args) && ($args[0] === 'php' OR !is_string($args[0]))) {
-
- // If the last worker fork was less than 10 seconds before then don't fork another one.
- // This should prevent the forking of masses of workers.
- if (get_config("system", "worker")) {
- $cachekey = "app:proc_run:started";
- $result = Cache::get($cachekey);
- if (!is_null($result)) {
- if ((time() - $result) < 10) {
- return;
- }
- }
- // Set the timestamp of the last proc_run
- Cache::set($cachekey, time(), CACHE_MINUTE);
- }
+ // If the last worker fork was less than 10 seconds before then don't fork another one.
+ // This should prevent the forking of masses of workers.
+ $cachekey = "app:proc_run:started";
+ $result = Cache::get($cachekey);
- $args[0] = ((x($this->config,'php_path')) && (strlen($this->config['php_path'])) ? $this->config['php_path'] : 'php');
+ if (!is_null($result) AND (time() - $result) < 10) {
+ return;
}
+ // Set the timestamp of the last proc_run
+ Cache::set($cachekey, time(), CACHE_MINUTE);
+
+ array_unshift($args, ((x($this->config,'php_path')) && (strlen($this->config['php_path'])) ? $this->config['php_path'] : 'php'));
+
// add baseurl to args. cli scripts can't construct it
$args[] = $this->get_baseurl();
- for($x = 0; $x < count($args); $x ++)
+ for ($x = 0; $x < count($args); $x ++) {
$args[$x] = escapeshellarg($args[$x]);
+ }
- $cmdline = implode($args," ");
+ $cmdline = implode($args, " ");
- if(get_config('system','proc_windows'))
- proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo,dirname(__FILE__)));
- else
- proc_close(proc_open($cmdline." &",array(),$foo,dirname(__FILE__)));
+ if (get_config('system', 'proc_windows')) {
+ proc_close(proc_open('cmd /c start /b ' . $cmdline, array(), $foo, dirname(__FILE__)));
+ } else {
+ proc_close(proc_open($cmdline . " &", array(), $foo, dirname(__FILE__)));
+ }
}
* @return bool|int
*/
function x($s,$k = NULL) {
- if($k != NULL) {
- if((is_array($s)) && (array_key_exists($k,$s))) {
- if($s[$k])
+ if ($k != NULL) {
+ if ((is_array($s)) && (array_key_exists($k, $s))) {
+ if ($s[$k]) {
return (int) 1;
+ }
return (int) 0;
- }
+ }
return false;
- }
- else {
- if(isset($s)) {
- if($s) {
+ } else {
+ if (isset($s)) {
+ if ($s) {
return (int) 1;
}
return (int) 0;
function z_path() {
$base = App::get_baseurl();
- if(! clean_urls())
+ if (! clean_urls()) {
$base .= '/?q=';
+ }
return $base;
}
* @return string
*/
function absurl($path) {
- if(strpos($path,'/') === 0)
+ if (strpos($path,'/') === 0) {
return z_path() . $path;
+ }
return $path;
}
function check_db() {
$build = get_config('system','build');
- if(! x($build)) {
+ if (! x($build)) {
set_config('system','build',DB_UPDATE_VERSION);
$build = DB_UPDATE_VERSION;
}
- if($build != DB_UPDATE_VERSION)
+ if ($build != DB_UPDATE_VERSION) {
proc_run(PRIORITY_CRITICAL, 'include/dbupdate.php');
+ }
}
// and www.example.com vs example.com.
// We will only change the url to an ip address if there is no existing setting
- if(! x($url))
+ if (! x($url)) {
$url = set_config('system','url',App::get_baseurl());
- if((! link_compare($url,App::get_baseurl())) && (! preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$a->get_hostname)))
+ }
+ if ((! link_compare($url,App::get_baseurl())) && (! preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$a->get_hostname))) {
$url = set_config('system','url',App::get_baseurl());
+ }
return;
}
*/
function update_db(App $a) {
$build = get_config('system','build');
- if(! x($build))
+ if (! x($build)) {
$build = set_config('system','build',DB_UPDATE_VERSION);
+ }
- if($build != DB_UPDATE_VERSION) {
+ if ($build != DB_UPDATE_VERSION) {
$stored = intval($build);
$current = intval(DB_UPDATE_VERSION);
- if($stored < $current) {
+ if ($stored < $current) {
Config::load('database');
// We're reporting a different version than what is currently installed.
// updating right this very second and the correct version of the update.php
// file may not be here yet. This can happen on a very busy site.
- if(DB_UPDATE_VERSION == UPDATE_VERSION) {
+ if (DB_UPDATE_VERSION == UPDATE_VERSION) {
// Compare the current structure with the defined structure
$t = get_config('database','dbupdate_'.DB_UPDATE_VERSION);
- if($t !== false)
+ if ($t !== false) {
return;
+ }
set_config('database','dbupdate_'.DB_UPDATE_VERSION, time());
// conflits with new routine)
for ($x = $stored; $x < NEW_UPDATE_ROUTINE_VERSION; $x++) {
$r = run_update_function($x);
- if (!$r) break;
+ if (!$r) {
+ break;
+ }
+ }
+ if ($stored < NEW_UPDATE_ROUTINE_VERSION) {
+ $stored = NEW_UPDATE_ROUTINE_VERSION;
}
- if ($stored < NEW_UPDATE_ROUTINE_VERSION) $stored = NEW_UPDATE_ROUTINE_VERSION;
-
// run new update routine
// it update the structure in one call
$retval = update_structure(false, true);
- if($retval) {
+ if ($retval) {
update_fail(
DB_UPDATE_VERSION,
$retval
}
// run any left update_nnnn functions in update.php
- for($x = $stored; $x < $current; $x ++) {
+ for ($x = $stored; $x < $current; $x ++) {
$r = run_update_function($x);
- if (!$r) break;
+ if (!$r) {
+ break;
+ }
}
}
}
}
function run_update_function($x) {
- if(function_exists('update_' . $x)) {
+ if (function_exists('update_' . $x)) {
// There could be a lot of processes running or about to run.
// We want exactly one process to run the update command.
// delete the config entry to try again.
$t = get_config('database','update_' . $x);
- if($t !== false)
+ if ($t !== false) {
return false;
+ }
set_config('database','update_' . $x, time());
// call the specific update
$func = 'update_' . $x;
$retval = $func();
- if($retval) {
+ if ($retval) {
//send the administrator an e-mail
update_fail(
$x,
*
* @param App $a
*
- */
+ */
function check_plugins(App $a) {
$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
- if (dbm::is_result($r))
+ if (dbm::is_result($r)) {
$installed = $r;
- else
+ } else {
$installed = array();
+ }
$plugins = get_config('system','addon');
$plugins_arr = array();
- if($plugins)
+ if ($plugins) {
$plugins_arr = explode(',',str_replace(' ', '',$plugins));
+ }
$a->plugins = $plugins_arr;
$installed_arr = array();
- if(count($installed)) {
- foreach($installed as $i) {
- if(! in_array($i['name'],$plugins_arr)) {
+ if (count($installed)) {
+ foreach ($installed as $i) {
+ if (! in_array($i['name'],$plugins_arr)) {
uninstall_plugin($i['name']);
- }
- else {
+ } else {
$installed_arr[] = $i['name'];
}
}
}
- if(count($plugins_arr)) {
- foreach($plugins_arr as $p) {
- if(! in_array($p,$installed_arr)) {
+ if (count($plugins_arr)) {
+ foreach ($plugins_arr as $p) {
+ if (! in_array($p,$installed_arr)) {
install_plugin($p);
}
}
$prefix = hash("crc32", $a->get_hostname());
}
- while (strlen($prefix) < ($size - 13))
+ while (strlen($prefix) < ($size - 13)) {
$prefix .= mt_rand();
+ }
if ($size >= 24) {
$prefix = substr($prefix, 0, $size - 22);
$dest_url = $a->query_string;
- if(local_user()) {
+ if (local_user()) {
$tpl = get_markup_template("logout.tpl");
- }
- else {
+ } else {
$a->page['htmlhead'] .= replace_macros(get_markup_template("login_head.tpl"),array(
- '$baseurl' => $a->get_baseurl(true)
+ '$baseurl' => $a->get_baseurl(true)
));
$tpl = get_markup_template("login.tpl");
$o .= replace_macros($tpl, array(
- '$dest_url' => $dest_url,
- '$logout' => t('Logout'),
- '$login' => t('Login'),
+ '$dest_url' => $dest_url,
+ '$logout' => t('Logout'),
+ '$login' => t('Login'),
- '$lname' => array('username', t('Nickname or Email: ') , '', ''),
- '$lpassword' => array('password', t('Password: '), '', ''),
- '$lremember' => array('remember', t('Remember me'), 0, ''),
+ '$lname' => array('username', t('Nickname or Email: ') , '', ''),
+ '$lpassword' => array('password', t('Password: '), '', ''),
+ '$lremember' => array('remember', t('Remember me'), 0, ''),
- '$openid' => !$noid,
- '$lopenid' => array('openid_url', t('Or login using OpenID: '),'',''),
+ '$openid' => !$noid,
+ '$lopenid' => array('openid_url', t('Or login using OpenID: '),'',''),
- '$hiddens' => $hiddens,
+ '$hiddens' => $hiddens,
- '$register' => $reg,
+ '$register' => $reg,
'$lostpass' => t('Forgot your password?'),
'$lostlink' => t('Password Reset'),
- '$tostitle' => t('Website Terms of Service'),
- '$toslink' => t('terms of service'),
+ '$tostitle' => t('Website Terms of Service'),
+ '$toslink' => t('terms of service'),
- '$privacytitle' => t('Website Privacy Policy'),
- '$privacylink' => t('privacy policy'),
+ '$privacytitle' => t('Website Privacy Policy'),
+ '$privacylink' => t('privacy policy'),
));
*/
function killme() {
- if (!get_app()->is_backend())
+ if (!get_app()->is_backend()) {
session_write_close();
+ }
- exit;
+ exit();
}
/**
* @brief Redirect to another URL and terminate this process.
*/
function goaway($s) {
- if (!strstr(normalise_link($s), "http://"))
+ if (!strstr(normalise_link($s), "http://")) {
$s = App::get_baseurl()."/".$s;
+ }
header("Location: $s");
killme();
if (x($_SESSION, 'my_address')) {
// Local user
$public_contact_id = intval(get_contact($_SESSION['my_address'], 0));
- } else if (x($_SESSION, 'visitor_home')) {
+ } elseif (x($_SESSION, 'visitor_home')) {
// Remote user
$public_contact_id = intval(get_contact($_SESSION['visitor_home'], 0));
}
- } else if (!x($_SESSION, 'authenticated')) {
+ } elseif (!x($_SESSION, 'authenticated')) {
$public_contact_id = false;
}
* @return int|bool visitor_id or false
*/
function remote_user() {
- if((x($_SESSION,'authenticated')) && (x($_SESSION,'visitor_id')))
+ if ((x($_SESSION,'authenticated')) && (x($_SESSION,'visitor_id'))) {
return intval($_SESSION['visitor_id']);
+ }
return false;
}
*/
function notice($s) {
$a = get_app();
- if(! x($_SESSION,'sysmsg')) $_SESSION['sysmsg'] = array();
- if($a->interactive)
+ if (! x($_SESSION,'sysmsg')) {
+ $_SESSION['sysmsg'] = array();
+ }
+ if ($a->interactive) {
$_SESSION['sysmsg'][] = $s;
+ }
}
/**
function info($s) {
$a = get_app();
- if (local_user() AND get_pconfig(local_user(),'system','ignore_info'))
+ if (local_user() AND get_pconfig(local_user(),'system','ignore_info')) {
return;
+ }
- if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array();
- if($a->interactive)
+ if (! x($_SESSION,'sysmsg_info')) {
+ $_SESSION['sysmsg_info'] = array();
+ }
+ if ($a->interactive) {
$_SESSION['sysmsg_info'][] = $s;
+ }
}
* @brief Wrap calls to proc_close(proc_open()) and call hook
* so plugins can take part in process :)
*
- * @param (string|integer|array) $cmd program to run, priority or parameter array
+ * @param (integer|array) priority or parameter array, $cmd atrings are deprecated and are ignored
*
* next args are passed as $cmd command line
- * e.g.: proc_run("ls","-la","/tmp");
* or: proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id);
* or: proc_run(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "include/create_shadowentry.php", $post_id);
*
$arr = array('args' => $args, 'run_cmd' => true);
call_hooks("proc_run", $arr);
- if (!$arr['run_cmd'] OR !count($args))
- return;
-
- if (!get_config("system", "worker") OR (is_string($run_parameter) AND ($run_parameter != 'php'))) {
- $a->proc_run($args);
+ if (!$arr['run_cmd'] OR !count($args)) {
return;
}
$found = q("SELECT `id` FROM `workerqueue` WHERE `parameter` = '%s'",
dbesc($parameters));
- if (!$found)
+ if (!dbm::is_result($found)) {
q("INSERT INTO `workerqueue` (`parameter`, `created`, `priority`)
VALUES ('%s', '%s', %d)",
dbesc($parameters),
dbesc(datetime_convert()),
intval($priority));
+ }
// Should we quit and wait for the poller to be called as a cronjob?
if ($dont_fork) {
}
// Checking number of workers
- $workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
+ $workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` > '%s'", dbesc(NULL_DATE));
// Get number of allowed number of worker threads
$queues = intval(get_config("system", "worker_queues"));
- if ($queues == 0)
+ if ($queues == 0) {
$queues = 4;
+ }
// If there are already enough workers running, don't fork another one
- if ($workers[0]["workers"] >= $queues)
+ if ($workers[0]["workers"] >= $queues) {
return;
+ }
// Now call the poller to execute the jobs that we just added to the queue
- $args = array("php", "include/poller.php", "no_cron");
+ $args = array("include/poller.php", "no_cron");
$a->proc_run($args);
}
// Find the theme that belongs to the user whose stuff we are looking at
- if($a->profile_uid && ($a->profile_uid != local_user())) {
+ if ($a->profile_uid && ($a->profile_uid != local_user())) {
$r = q("select theme from user where uid = %d limit 1",
intval($a->profile_uid)
);
- if (dbm::is_result($r))
+ if (dbm::is_result($r)) {
$page_theme = $r[0]['theme'];
+ }
}
// Allow folks to over-rule user themes and always use their own on their own site.
// This works only if the user is on the same server
- if($page_theme && local_user() && (local_user() != $a->profile_uid)) {
- if(get_pconfig(local_user(),'system','always_my_theme'))
+ if ($page_theme && local_user() && (local_user() != $a->profile_uid)) {
+ if (get_pconfig(local_user(),'system','always_my_theme')) {
$page_theme = null;
+ }
}
// $mobile_detect = new Mobile_Detect();
}
$theme_name = ((isset($_SESSION) && x($_SESSION,'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme);
- if($theme_name === '---') {
+ if ($theme_name === '---') {
// user has selected to have the mobile theme be the same as the normal one
$system_theme = $standard_system_theme;
$theme_name = $standard_theme_name;
- if($page_theme)
+ if ($page_theme) {
$theme_name = $page_theme;
+ }
}
}
- }
- else {
+ } else {
$system_theme = $standard_system_theme;
$theme_name = $standard_theme_name;
- if($page_theme)
+ if ($page_theme) {
$theme_name = $page_theme;
+ }
}
- if($theme_name &&
+ if ($theme_name &&
(file_exists('view/theme/' . $theme_name . '/style.css') ||
- file_exists('view/theme/' . $theme_name . '/style.php')))
+ file_exists('view/theme/' . $theme_name . '/style.php'))) {
return($theme_name);
+ }
- foreach($app_base_themes as $t) {
- if(file_exists('view/theme/' . $t . '/style.css')||
- file_exists('view/theme/' . $t . '/style.php'))
+ foreach ($app_base_themes as $t) {
+ if (file_exists('view/theme/' . $t . '/style.css') ||
+ file_exists('view/theme/' . $t . '/style.php')) {
return($t);
+ }
}
$fallback = array_merge(glob('view/theme/*/style.css'),glob('view/theme/*/style.php'));
- if(count($fallback))
+ if (count($fallback)) {
return (str_replace('view/theme/','', substr($fallback[0],0,-10)));
+ }
+ /// @TODO No final return statement?
}
/**
$t = current_theme();
$opts = (($a->profile_uid) ? '?f=&puid=' . $a->profile_uid : '');
- if (file_exists('view/theme/' . $t . '/style.php'))
+ if (file_exists('view/theme/' . $t . '/style.php')) {
return('view/theme/'.$t.'/style.pcss'.$opts);
+ }
return('view/theme/'.$t.'/style.css');
}
$birthday = '';
- if(! strlen($tz))
+ if (! strlen($tz)) {
$tz = 'UTC';
+ }
$p = q("SELECT `dob` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
intval($uid)
if (dbm::is_result($p)) {
$tmp_dob = substr($p[0]['dob'],5);
- if(intval($tmp_dob)) {
+ if (intval($tmp_dob)) {
$y = datetime_convert($tz,$tz,'now','Y');
$bd = $y . '-' . $tmp_dob . ' 00:00';
$t_dob = strtotime($bd);
$now = strtotime(datetime_convert($tz,$tz,'now'));
- if($t_dob < $now)
+ if ($t_dob < $now) {
$bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
+ }
$birthday = datetime_convert($tz,'UTC',$bd,ATOM_TIME);
}
}
$adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
//if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email']))
- if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && in_array($a->user['email'], $adminlist))
+ if (local_user() && x($a->user,'email') && x($a->config,'admin_email') && in_array($a->user['email'], $adminlist)) {
return true;
+ }
return false;
}
*
* @return string
*/
-function build_querystring($params, $name=null) {
+function build_querystring($params, $name = null) {
$ret = "";
- foreach($params as $key=>$val) {
- if(is_array($val)) {
- if($name==null) {
+ foreach ($params as $key => $val) {
+ if (is_array($val)) {
+ /// @TODO maybe not compare against null, use is_null()
+ if ($name == null) {
$ret .= build_querystring($val, $key);
} else {
$ret .= build_querystring($val, $name."[$key]");
}
} else {
$val = urlencode($val);
- if($name!=null) {
- $ret.=$name."[$key]"."=$val&";
+ /// @TODO maybe not compare against null, use is_null()
+ if ($name != null) {
+ /// @TODO two string concated, can be merged to one
+ $ret .= $name . "[$key]" . "=$val&";
} else {
- $ret.= "$key=$val&";
+ $ret .= "$key=$val&";
}
}
}
function explode_querystring($query) {
$arg_st = strpos($query, '?');
- if($arg_st !== false) {
+ if ($arg_st !== false) {
$base = substr($query, 0, $arg_st);
$arg_st += 1;
} else {
}
$args = explode('&', substr($query, $arg_st));
- foreach($args as $k=>$arg) {
- if($arg === '')
+ foreach ($args as $k => $arg) {
+ /// @TODO really compare type-safe here?
+ if ($arg === '') {
unset($args[$k]);
+ }
}
$args = array_values($args);
- if(!$base) {
+ if (!$base) {
$base = $args[0];
unset($args[0]);
$args = array_values($args);
*/
function curPageURL() {
$pageURL = 'http';
- if ($_SERVER["HTTPS"] == "on") {$pageURL .= "s";}
+ if ($_SERVER["HTTPS"] == "on") {
+ $pageURL .= "s";
+ }
+
$pageURL .= "://";
+
if ($_SERVER["SERVER_PORT"] != "80" && $_SERVER["SERVER_PORT"] != "443") {
$pageURL .= $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"].$_SERVER["REQUEST_URI"];
} else {
function random_digits($digits) {
$rn = '';
- for($i = 0; $i < $digits; $i++) {
+ for ($i = 0; $i < $digits; $i++) {
+ /// @TODO rand() is different to mt_rand() and maybe lesser "random"
$rn .= rand(0,9);
}
return $rn;
function get_server() {
$server = get_config("system", "directory");
- if ($server == "")
+ if ($server == "") {
$server = "http://dir.friendi.ca";
+ }
return($server);
}
function get_cachefile($file, $writemode = true) {
$cache = get_itemcachepath();
- if ((! $cache) || (! is_dir($cache)))
+ if ((! $cache) || (! is_dir($cache))) {
return("");
+ }
- $subfolder = $cache."/".substr($file, 0, 2);
+ $subfolder = $cache . "/" . substr($file, 0, 2);
- $cachepath = $subfolder."/".$file;
+ $cachepath = $subfolder . "/" . $file;
if ($writemode) {
if (!is_dir($subfolder)) {
}
}
- return($cachepath);
+ /// @TODO no need to put braces here
+ return $cachepath;
}
function clear_cache($basepath = "", $path = "") {
$path = $basepath;
}
- if (($path == "") OR (!is_dir($path)))
+ if (($path == "") OR (!is_dir($path))) {
return;
+ }
- if (substr(realpath($path), 0, strlen($basepath)) != $basepath)
+ if (substr(realpath($path), 0, strlen($basepath)) != $basepath) {
return;
+ }
$cachetime = (int)get_config('system','itemcache_duration');
- if ($cachetime == 0)
+ if ($cachetime == 0) {
$cachetime = 86400;
+ }
if (is_writable($path)){
if ($dh = opendir($path)) {
while (($file = readdir($dh)) !== false) {
$fullpath = $path."/".$file;
- if ((filetype($fullpath) == "dir") and ($file != ".") and ($file != ".."))
+ if ((filetype($fullpath) == "dir") and ($file != ".") and ($file != "..")) {
clear_cache($basepath, $fullpath);
- if ((filetype($fullpath) == "file") and (filectime($fullpath) < (time() - $cachetime)))
+ }
+ if ((filetype($fullpath) == "file") and (filectime($fullpath) < (time() - $cachetime))) {
unlink($fullpath);
+ }
}
closedir($dh);
}
function get_itemcachepath() {
// Checking, if the cache is deactivated
$cachetime = (int)get_config('system','itemcache_duration');
- if ($cachetime < 0)
+ if ($cachetime < 0) {
return "";
+ }
$itemcache = get_config('system','itemcache');
if (($itemcache != "") AND App::directory_usable($itemcache)) {
if ($temppath != "") {
$itemcache = $temppath."/itemcache";
- if(!file_exists($itemcache) && !is_dir($itemcache)) {
+ if (!file_exists($itemcache) && !is_dir($itemcache)) {
mkdir($itemcache);
}
return "";
}
-function get_lockpath() {
- $lockpath = get_config('system','lockpath');
- if (($lockpath != "") AND App::directory_usable($lockpath)) {
- // We have a lock path and it is usable
- return $lockpath;
- }
-
- // We don't have a working preconfigured lock path, so we take the temp path.
- $temppath = get_temppath();
-
- if ($temppath != "") {
- // To avoid any interferences with other systems we create our own directory
- $lockpath = $temppath."/lock";
- if (!is_dir($lockpath)) {
- mkdir($lockpath);
- }
-
- if (App::directory_usable($lockpath)) {
- // The new path is usable, we are happy
- set_config("system", "lockpath", $lockpath);
- return $lockpath;
- } else {
- // We can't create a subdirectory, strange.
- // But the directory seems to work, so we use it but don't store it.
- return $temppath;
- }
- }
-
- // Reaching this point means that the operating system is configured badly.
- return "";
-}
-
/**
* @brief Returns the path where spool files are stored
*
// Check if it is usable
if (($temppath != "") AND App::directory_usable($temppath)) {
// To avoid any interferences with other systems we create our own directory
- $new_temppath .= "/".$a->get_hostname();
- if (!is_dir($new_temppath))
+ $new_temppath = $temppath."/".$a->get_hostname();
+ if (!is_dir($new_temppath)) {
+ /// @TODO There is a mkdir()+chmod() upwards, maybe generalize this (+ configurable) into a function/method?
mkdir($new_temppath);
+ }
if (App::directory_usable($new_temppath)) {
// The new path is usable, we are happy
function set_template_engine(App $a, $engine = 'internal') {
/// @note This function is no longer necessary, but keep it as a wrapper to the class method
/// to avoid breaking themes again unnecessarily
+/// @TODO maybe output a warning here so the theme developer can see it? PHP won't show such warnings like Java does.
$a->set_template_engine($engine);
}
-if(!function_exists('exif_imagetype')) {
+if (!function_exists('exif_imagetype')) {
function exif_imagetype($file) {
$size = getimagesize($file);
- return($size[2]);
+ return $size[2];
}
}
$file = realpath($file);
- if (strpos($file, getcwd()) !== 0)
+ if (strpos($file, getcwd()) !== 0) {
return false;
+ }
$file = str_replace(getcwd()."/", "", $file, $count);
- if ($count != 1)
+ if ($count != 1) {
return false;
+ }
- if ($orig_file !== $file)
+ if ($orig_file !== $file) {
return false;
+ }
$valid = false;
- if (strpos($file, "include/") === 0)
+ if (strpos($file, "include/") === 0) {
$valid = true;
+ }
- if (strpos($file, "addon/") === 0)
+ if (strpos($file, "addon/") === 0) {
$valid = true;
+ }
- if (!$valid)
- return false;
-
- return true;
+ // Simply return flag
+ return ($valid);
}
function current_load() {
- if (!function_exists('sys_getloadavg'))
+ if (!function_exists('sys_getloadavg')) {
return false;
+ }
$load_arr = sys_getloadavg();
- if (!is_array($load_arr))
+ if (!is_array($load_arr)) {
return false;
+ }
return max($load_arr[0], $load_arr[1]);
}
* @return string Value of the argv key
*/
function argv($x) {
- if(array_key_exists($x,get_app()->argv))
+ if (array_key_exists($x,get_app()->argv)) {
return get_app()->argv[$x];
+ }
return '';
}
AND ($module == "network") AND ($_GET["mode"] != "minimal")) {
// get the page number
- if (is_string($_GET["page"]))
+ if (is_string($_GET["page"])) {
$pageno = $_GET["page"];
- else
+ } else {
$pageno = 1;
+ }
$reload_uri = "";
// try to get the uri from which we load the content
- foreach ($_GET AS $param => $value)
- if (($param != "page") AND ($param != "q"))
- $reload_uri .= "&".$param."=".urlencode($value);
+ foreach ($_GET AS $param => $value) {
+ if (($param != "page") AND ($param != "q")) {
+ $reload_uri .= "&" . $param . "=" . urlencode($value);
+ }
+ }
- if (($a->page_offset != "") AND !strstr($reload_uri, "&offset="))
- $reload_uri .= "&offset=".urlencode($a->page_offset);
+ if (($a->page_offset != "") AND !strstr($reload_uri, "&offset=")) {
+ $reload_uri .= "&offset=" . urlencode($a->page_offset);
+ }
$arr = array("pageno" => $pageno, "reload_uri" => $reload_uri);