define('FRIENDICA_PLATFORM', 'Friendica');
define('FRIENDICA_CODENAME', 'The Tazmans Flax-lily');
-define('FRIENDICA_VERSION', '2018.12-dev');
+define('FRIENDICA_VERSION', '2018.12-rc');
define('DFRN_PROTOCOL_VERSION', '2.23');
define('NEW_UPDATE_ROUTINE_VERSION', 1170);
* @brief Image storage quality.
*
* Lower numbers save space at cost of image detail.
- * For ease of upgrade, please do not change here. Set [system] jpegquality = n in config/local.ini.php,
+ * For ease of upgrade, please do not change here. Set system.jpegquality = n in config/local.config.php,
* where n is between 1 and 100, and with very poor results below about 50
*/
define('JPEG_QUALITY', 100);
/**
- * [system] png_quality = n where is between 0 (uncompressed) to 9
+ * system.png_quality = n where is between 0 (uncompressed) to 9
*/
define('PNG_QUALITY', 8);
* this length (on the longest side, the other side will be scaled appropriately).
* Modify this value using
*
- * [system]
- * max_image_length = n;
+ * 'system' => [
+ * 'max_image_length' => 'n',
+ * ...
+ * ],
*
- * in config/local.ini.php
+ * in config/local.config.php
*
* If you don't want to set a maximum length, set to -1. The default value is
* defined by 'MAX_IMAGE_LENGTH' below.
return BaseObject::getApp();
}
-/**
- * @brief Multi-purpose function to check variable state.
- *
- * Usage: x($var) or $x($array, 'key')
- *
- * returns false if variable/key is not set
- * if variable is set, returns 1 if has 'non-zero' value, otherwise returns 0.
- * e.g. x('') or x(0) returns 0;
- *
- * @param string|array $s variable to check
- * @param string $k key inside the array to check
- *
- * @return bool|int
- */
-function x($s, $k = null)
-{
- 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) {
- return (int) 1;
- }
- return (int) 0;
- }
- return false;
- }
-}
-
/**
* Return the provided variable value if it exists and is truthy or the provided
* default value instead.
* - defaults($var, $default)
* - defaults($array, 'key', $default)
*
+ * @param array $args
* @brief Returns a defaut value if the provided variable or array key is falsy
- * @see x()
* @return mixed
*/
-function defaults() {
- $args = func_get_args();
-
+function defaults(...$args)
+{
if (count($args) < 2) {
throw new BadFunctionCallException('defaults() requires at least 2 parameters');
}
throw new BadFunctionCallException('defaults($arr, $key, $def) $key is null');
}
- $default = array_pop($args);
+ // The default value always is the last argument
+ $return = array_pop($args);
- if (call_user_func_array('x', $args)) {
- if (count($args) === 1) {
- $return = $args[0];
- } else {
- $return = $args[0][$args[1]];
- }
- } else {
- $return = $default;
+ if (count($args) == 2 && is_array($args[0]) && !empty($args[0][$args[1]])) {
+ $return = $args[0][$args[1]];
}
- return $return;
-}
-
-/**
- * @brief Automatic database updates
- * @param object $a App
- */
-function update_db()
-{
- $build = Config::get('system', 'build');
-
- if (empty($build) || ($build > DB_UPDATE_VERSION)) {
- $build = DB_UPDATE_VERSION - 1;
- Config::set('system', 'build', $build);
+ if (count($args) == 1 && !empty($args[0])) {
+ $return = $args[0];
}
- if ($build != DB_UPDATE_VERSION) {
- require_once 'update.php';
-
- $stored = intval($build);
- $current = intval(DB_UPDATE_VERSION);
- if ($stored < $current) {
- Config::load('database');
-
- // Compare the current structure with the defined structure
- $t = Config::get('database', 'dbupdate_' . DB_UPDATE_VERSION);
- if (!is_null($t)) {
- return;
- }
-
- // run the pre_update_nnnn functions in update.php
- for ($x = $stored + 1; $x <= $current; $x++) {
- $r = run_update_function($x, 'pre_update');
- if (!$r) {
- break;
- }
- }
-
- Config::set('database', 'dbupdate_' . DB_UPDATE_VERSION, time());
-
- // update the structure in one call
- $retval = DBStructure::update(false, true);
- if ($retval) {
- DBStructure::updateFail(
- DB_UPDATE_VERSION,
- $retval
- );
- return;
- } else {
- Config::set('database', 'dbupdate_' . DB_UPDATE_VERSION, 'success');
- }
-
- // run the update_nnnn functions in update.php
- for ($x = $stored + 1; $x <= $current; $x++) {
- $r = run_update_function($x, 'update');
- if (!$r) {
- break;
- }
- }
- }
- }
-
- return;
-}
-
-function run_update_function($x, $prefix)
-{
- $funcname = $prefix . '_' . $x;
-
- if (function_exists($funcname)) {
- // There could be a lot of processes running or about to run.
- // We want exactly one process to run the update command.
- // So store the fact that we're taking responsibility
- // after first checking to see if somebody else already has.
- // If the update fails or times-out completely you may need to
- // delete the config entry to try again.
-
- $t = Config::get('database', $funcname);
- if (!is_null($t)) {
- return false;
- }
- Config::set('database', $funcname, time());
-
- // call the specific update
- $retval = $funcname();
-
- if ($retval) {
- //send the administrator an e-mail
- DBStructure::updateFail(
- $x,
- L10n::t('Update %s failed. See error logs.', $x)
- );
- return false;
- } else {
- Config::set('database', $funcname, 'success');
-
- if ($prefix == 'update') {
- Config::set('system', 'build', $x);
- }
-
- return true;
- }
- } else {
- Config::set('database', $funcname, 'success');
-
- if ($prefix == 'update') {
- Config::set('system', 'build', $x);
- }
-
- return true;
- }
+ return $return;
}
/**
{
static $public_contact_id = false;
- if (!$public_contact_id && x($_SESSION, 'authenticated')) {
- if (x($_SESSION, 'my_address')) {
+ if (!$public_contact_id && !empty($_SESSION['authenticated'])) {
+ if (!empty($_SESSION['my_address'])) {
// Local user
$public_contact_id = intval(Contact::getIdForURL($_SESSION['my_address'], 0, true));
- } elseif (x($_SESSION, 'visitor_home')) {
+ } elseif (!empty($_SESSION['visitor_home'])) {
// Remote user
$public_contact_id = intval(Contact::getIdForURL($_SESSION['visitor_home'], 0, true));
}
- } elseif (!x($_SESSION, 'authenticated')) {
+ } elseif (empty($_SESSION['authenticated'])) {
$public_contact_id = false;
}
return false;
}
- if (x($_SESSION, 'authenticated') && x($_SESSION, 'visitor_id')) {
+ if (!empty($_SESSION['authenticated']) && !empty($_SESSION['visitor_id'])) {
return intval($_SESSION['visitor_id']);
}
return false;
}
$a = get_app();
- if (!x($_SESSION, 'sysmsg')) {
+ if (empty($_SESSION['sysmsg'])) {
$_SESSION['sysmsg'] = [];
}
if ($a->interactive) {
return;
}
- if (!x($_SESSION, 'sysmsg_info')) {
+ if (empty($_SESSION['sysmsg_info'])) {
$_SESSION['sysmsg_info'] = [];
}
if ($a->interactive) {
return $pageURL;
}
-function random_digits($digits)
-{
- $rn = '';
- for ($i = 0; $i < $digits; $i++) {
- /// @TODO Avoid rand/mt_rand, when it comes to cryptography, they are generating predictable (seedable) numbers.
- $rn .= rand(0, 9);
- }
- return $rn;
-}
-
function get_server()
{
$server = Config::get("system", "directory");
// Simply return flag
return $valid;
}
+
+/**
+ * PHP 5 compatible dirname() with count parameter
+ *
+ * @see http://php.net/manual/en/function.dirname.php#113193
+ *
+ * @deprecated with PHP 7
+ * @param string $path
+ * @param int $levels
+ * @return string
+ */
+function rdirname($path, $levels = 1)
+{
+ if ($levels > 1) {
+ return dirname(rdirname($path, --$levels));
+ } else {
+ return dirname($path);
+ }
+}
\ No newline at end of file