harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
habeascodice 2014-09-28 19:31:19 -07:00
commit 73ebdff083
12 changed files with 431 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/bbcode.php
View File

@ -610,7 +610,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
// Check for [spoiler=Author] text // Check for [spoiler=Author] text
$t_wrote = t('$1 wrote:'); $t_wrote = t('$1 spoiler');
// handle nested quotes // handle nested quotes
$endlessloop = 0; $endlessloop = 0;

374
include/config.php
View File

@ -1,30 +1,56 @@
<?php /** @file */ <?php
/** /**
* @file include/config.php
* @brief Arbitrary configuration storage.
* *
* Arbitrary configuration storage
* Note: * Note:
* Please do not store booleans - convert to 0/1 integer values * Please do not store booleans - convert to 0/1 integer values
* The get_?config() functions return boolean false for keys that are unset, * The get_?config() functions return boolean false for keys that are unset,
* and this could lead to subtle bugs. * and this could lead to subtle bugs.
* *
* There are a few places in the code (such as the admin panel) where boolean * Arrays get stored as serialize strings.
* configurations need to be fixed as of 10/08/2011. *
* @todo There are a few places in the code (such as the admin panel) where
* boolean configurations need to be fixed as of 10/08/2011.
*
* - <b>config</b> is used for hub specific configurations. It overrides the
* configurations from .htconfig file. The storage is of size TEXT.
* - <b>pconfig</b> is used for channel specific configurations and takes a
* <i>channel_id</i> as identifier. It stores for example which features are
* enabled per channel. The storage is of size MEDIUMTEXT.
* @code $var = get_pconfig(local_user(), 'category', 'key');@endcode
* - <b>xconfig</b> is the same as pconfig, except that it uses <i>xchan</i> as
* an identifier. This is for example for people who do not have a local account.
* The storage is of size MEDIUMTEXT.
* @code $observer = $a->get_observer_hash();
* if ($observer) {
* $var = get_xconfig($observer, 'category', 'key');
* }@endcode
*
* - get_config() and set_config() can also be done through the command line tool
* @ref util/config
* - get_pconfig() and set_pconfig() can also be done through the command line tool
* @ref util/pconfig and takes a channel_id as first argument.
*
*/ */
/**
// retrieve a "family" of config variables from database to cached storage * @brief Loads the hub's configuration from database to a cached storage.
*
* Retrieve a category ($family) of config variables from database to a cached
* storage in the global $a->config[$family].
*
* @param string $family
* The category of the configuration value
*/
function load_config($family) { function load_config($family) {
global $a; global $a;
if(! array_key_exists($family,$a->config)) if(! array_key_exists($family, $a->config))
$a->config[$family] = array(); $a->config[$family] = array();
if(! array_key_exists('config_loaded',$a->config[$family])) { if(! array_key_exists('config_loaded', $a->config[$family])) {
$r = q("SELECT * FROM config WHERE cat = '%s'", dbesc($family)); $r = q("SELECT * FROM config WHERE cat = '%s'", dbesc($family));
if($r !== false) { if($r !== false) {
if($r) { if($r) {
foreach($r as $rr) { foreach($r as $rr) {
@ -37,24 +63,31 @@ function load_config($family) {
} }
} }
// get a particular config variable given the family name /**
// and key. Returns false if not set. * @brief Get a particular config variable given the category name ($family)
// $instore is only used by the set_config function * and a key.
// to determine if the key already exists in the DB *
// If a key is found in the DB but doesn't exist in * Get a particular config variable from the given category ($family) and the
// local config cache, pull it into the cache so we don't have * $key from a cached storage in $a->config[$family]. If a key is found in the
// to hit the DB again for this item. * DB but does not exist in local config cache, pull it into the cache so we
* do not have to hit the DB again for this item.
*
* Returns false if not set.
*
* @param string $family
* The category of the configuration value
* @param string $key
* The configuration key to query
* @return mixed Return value or false on error or if not set
*/
function get_config($family, $key) { function get_config($family, $key) {
global $a; global $a;
if((! array_key_exists($family,$a->config)) || (! array_key_exists('config_loaded',$a->config[$family]))) if((! array_key_exists($family, $a->config)) || (! array_key_exists('config_loaded', $a->config[$family])))
load_config($family); load_config($family);
if(array_key_exists('config_loaded',$a->config[$family])) { if(array_key_exists('config_loaded', $a->config[$family])) {
if(! array_key_exists($key,$a->config[$family])) { if(! array_key_exists($key, $a->config[$family])) {
return false; return false;
} }
return ((! is_array($a->config[$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$family][$key])) return ((! is_array($a->config[$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$family][$key]))
@ -65,36 +98,59 @@ function get_config($family, $key) {
return false; return false;
} }
function get_config_from_storage($family,$key) { /**
$ret = q("select * from config where cat = '%s' and k = '%s' limit 1", * @brief Returns a value directly from the database configuration storage.
*
* This function queries directly the database and bypasses the chached storage
* from get_config($family, $key).
*
* @param string $family
* The category of the configuration value
* @param string $key
* The configuration key to query
* @return mixed
*/
function get_config_from_storage($family, $key) {
$ret = q("SELECT * FROM config WHERE cat = '%s' AND k = '%s' LIMIT 1",
dbesc($family), dbesc($family),
dbesc($key) dbesc($key)
); );
return $ret; return $ret;
} }
/**
* @brief Sets a configuration value for the hub.
// Store a config value ($value) in the category ($family) *
// under the key ($key) * Stores a config value ($value) in the category ($family) under the key ($key).
// Return the value, or false if the database update failed *
* Please do not store booleans - convert to 0/1 integer values!
function set_config($family,$key,$value) { *
* @param string $family
* The category of the configuration value
* @param string $key
* The configuration key to set
* @param mixed $value
* The value to store in the configuration
* @return mixed
* Return the set value, or false if the database update failed
*/
function set_config($family, $key, $value) {
global $a; global $a;
// manage array value // manage array value
$dbvalue = ((is_array($value)) ? serialize($value) : $value); $dbvalue = ((is_array($value)) ? serialize($value) : $value);
$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue); $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue);
if(get_config($family,$key) === false || (! get_config_from_storage($family,$key))) { if(get_config($family, $key) === false || (! get_config_from_storage($family, $key))) {
$a->config[$family][$key] = $value;
$ret = q("INSERT INTO config ( cat, k, v ) VALUES ( '%s', '%s', '%s' ) ", $ret = q("INSERT INTO config ( cat, k, v ) VALUES ( '%s', '%s', '%s' ) ",
dbesc($family), dbesc($family),
dbesc($key), dbesc($key),
dbesc($dbvalue) dbesc($dbvalue)
); );
if($ret) if($ret) {
return $value; $a->config[$family][$key] = $value;
$ret = $value;
}
return $ret; return $ret;
} }
@ -104,18 +160,32 @@ function set_config($family,$key,$value) {
dbesc($key) dbesc($key)
); );
$a->config[$family][$key] = $value; if($ret) {
$a->config[$family][$key] = $value;
if($ret) $ret = $value;
return $value; }
return $ret; return $ret;
} }
function del_config($family,$key) { /**
* @brief Deletes the given key from the hub's configuration database.
*
* Removes the configured value from the stored cache in $a->config[$family]
* and removes it from the database.
*
* @param string $family
* The category of the configuration value
* @param string $key
* The configuration key to delete
* @return mixed
*/
function del_config($family, $key) {
global $a; global $a;
if(array_key_exists($family,$a->config) && array_key_exists($key,$a->config[$family])) $ret = false;
if(array_key_exists($family, $a->config) && array_key_exists($key, $a->config[$family]))
unset($a->config[$family][$key]); unset($a->config[$family][$key]);
$ret = q("DELETE FROM config WHERE cat = '%s' AND k = '%s' LIMIT 1", $ret = q("DELETE FROM config WHERE cat = '%s' AND k = '%s' LIMIT 1",
dbesc($family), dbesc($family),
dbesc($key) dbesc($key)
); );
@ -123,17 +193,25 @@ function del_config($family,$key) {
} }
function load_pconfig($uid,$family = '') { /**
* @brief Loads all configuration values of a channel into a cached storage.
*
* All configuration values of the given channel are stored in global cache
* which is available under the global variable $a->config[$uid].
*
* @param string $uid
* The channel_id
* @return void|false Nothing or false if $uid is false
*/
function load_pconfig($uid) {
global $a; global $a;
if($uid === false) if($uid === false)
return false; return false;
if(! array_key_exists($uid,$a->config)) if(! array_key_exists($uid, $a->config))
$a->config[$uid] = array(); $a->config[$uid] = array();
// family is no longer used - load entire user config
$r = q("SELECT * FROM `pconfig` WHERE `uid` = %d", $r = q("SELECT * FROM `pconfig` WHERE `uid` = %d",
intval($uid) intval($uid)
); );
@ -142,59 +220,88 @@ function load_pconfig($uid,$family = '') {
foreach($r as $rr) { foreach($r as $rr) {
$k = $rr['k']; $k = $rr['k'];
$c = $rr['cat']; $c = $rr['cat'];
if(! array_key_exists($c,$a->config[$uid])) { if(! array_key_exists($c, $a->config[$uid])) {
$a->config[$uid][$c] = array(); $a->config[$uid][$c] = array();
$a->config[$uid][$c]['config_loaded'] = true; $a->config[$uid][$c]['config_loaded'] = true;
} }
$a->config[$uid][$c][$k] = $rr['v']; $a->config[$uid][$c][$k] = $rr['v'];
} }
} }
} }
/**
* @brief Get a particular channel's config variable given the category name
* ($family) and a key.
function get_pconfig($uid,$family, $key, $instore = false) { *
* Get a particular channel's config value from the given category ($family)
* and the $key from a cached storage in $a->config[$uid].
*
* Returns false if not set.
*
* @param string $uid
* The channel_id
* @param string $family
* The category of the configuration value
* @param string $key
* The configuration key to query
* @param boolean $instore (deprecated, without function)
* @return mixed Stored value or false if it does not exist
*/
function get_pconfig($uid, $family, $key, $instore = false) {
logger('include/config.php: get_pconfig() deprecated instore param used', LOGGER_DEBUG);
global $a; global $a;
if($uid === false) if($uid === false)
return false; return false;
if(! array_key_exists($uid,$a->config)) if(! array_key_exists($uid, $a->config))
load_pconfig($uid); load_pconfig($uid);
if((! array_key_exists($family,$a->config[$uid])) || (! array_key_exists($key,$a->config[$uid][$family]))) if((! array_key_exists($family, $a->config[$uid])) || (! array_key_exists($key, $a->config[$uid][$family])))
return false; return false;
return ((! is_array($a->config[$uid][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$uid][$family][$key])) return ((! is_array($a->config[$uid][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$uid][$family][$key]))
? unserialize($a->config[$uid][$family][$key]) ? unserialize($a->config[$uid][$family][$key])
: $a->config[$uid][$family][$key] : $a->config[$uid][$family][$key]
); );
} }
function set_pconfig($uid,$family,$key,$value) { /**
* @brief Sets a configuration value for a channel.
*
* Stores a config value ($value) in the category ($family) under the key ($key)
* for the channel_id $uid.
*
* Please do not store booleans - convert to 0/1 integer values!
*
* @param string $uid
* The channel_id
* @param string $family
* The category of the configuration value
* @param string $key
* The configuration key to query
* @return mixed Stored $value or false
*/
function set_pconfig($uid, $family, $key, $value) {
global $a; global $a;
// manage array value // manage array value
$dbvalue = ((is_array($value)) ? serialize($value) : $value); $dbvalue = ((is_array($value)) ? serialize($value) : $value);
$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue); $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue);
if(get_pconfig($uid,$family,$key) === false) { if(get_pconfig($uid, $family, $key) === false) {
if(! array_key_exists($uid,$a->config)) if(! array_key_exists($uid, $a->config))
$a->config[$uid] = array(); $a->config[$uid] = array();
if(! array_key_exists($family,$a->config[$uid])) if(! array_key_exists($family, $a->config[$uid]))
$a->config[$uid][$family] = array(); $a->config[$uid][$family] = array();
// keep a separate copy for all variables which were // keep a separate copy for all variables which were
// set in the life of this page. We need this to // set in the life of this page. We need this to
// synchronise channel clones. // synchronise channel clones.
if(! array_key_exists('transient',$a->config[$uid])) if(! array_key_exists('transient', $a->config[$uid]))
$a->config[$uid]['transient'] = array(); $a->config[$uid]['transient'] = array();
if(! array_key_exists($family,$a->config[$uid]['transient'])) if(! array_key_exists($family, $a->config[$uid]['transient']))
$a->config[$uid]['transient'][$family] = array(); $a->config[$uid]['transient'][$family] = array();
$a->config[$uid][$family][$key] = $value; $a->config[$uid][$family][$key] = $value;
@ -222,9 +329,9 @@ function set_pconfig($uid,$family,$key,$value) {
// set in the life of this page. We need this to // set in the life of this page. We need this to
// synchronise channel clones. // synchronise channel clones.
if(! array_key_exists('transient',$a->config[$uid])) if(! array_key_exists('transient', $a->config[$uid]))
$a->config[$uid]['transient'] = array(); $a->config[$uid]['transient'] = array();
if(! array_key_exists($family,$a->config[$uid]['transient'])) if(! array_key_exists($family, $a->config[$uid]['transient']))
$a->config[$uid]['transient'][$family] = array(); $a->config[$uid]['transient'][$family] = array();
$a->config[$uid][$family][$key] = $value; $a->config[$uid][$family][$key] = $value;
@ -235,13 +342,27 @@ function set_pconfig($uid,$family,$key,$value) {
return $ret; return $ret;
} }
/**
function del_pconfig($uid,$family,$key) { * @brief Deletes the given key from the channel's configuration.
*
* Removes the configured value from the stored cache in $a->config[$uid]
* and removes it from the database.
*
* @param string $uid
* The channel_id
* @param string $family
* The category of the configuration value
* @param string $key
* The configuration key to delete
* @return mixed
*/
function del_pconfig($uid, $family, $key) {
global $a; global $a;
if(x($a->config[$uid][$family],$key)) $ret = false;
if(x($a->config[$uid][$family], $key))
unset($a->config[$uid][$family][$key]); unset($a->config[$uid][$family][$key]);
$ret = q("DELETE FROM pconfig WHERE uid = %d AND cat = '%s' AND k = '%s' LIMIT 1", $ret = q("DELETE FROM pconfig WHERE uid = %d AND cat = '%s' AND k = '%s' LIMIT 1",
intval($uid), intval($uid),
dbesc($family), dbesc($family),
dbesc($key) dbesc($key)
@ -250,18 +371,25 @@ function del_pconfig($uid,$family,$key) {
} }
/**
function load_xconfig($xchan,$family = '') { * @brief Loads a full xchan's configuration into a cached storage.
*
* All configuration values of the given observer hash are stored in global
* cache which is available under the global variable $a->config[$xchan].
*
* @param string $xchan
* The observer's hash
* @return void|false Returns false if xchan is not set
*/
function load_xconfig($xchan) {
global $a; global $a;
if(! $xchan) if(! $xchan)
return false; return false;
if(! array_key_exists($xchan,$a->config)) if(! array_key_exists($xchan, $a->config))
$a->config[$xchan] = array(); $a->config[$xchan] = array();
// family is no longer used. Entire config is loaded
$r = q("SELECT * FROM `xconfig` WHERE `xchan` = '%s'", $r = q("SELECT * FROM `xconfig` WHERE `xchan` = '%s'",
dbesc($xchan) dbesc($xchan)
); );
@ -270,51 +398,77 @@ function load_xconfig($xchan,$family = '') {
foreach($r as $rr) { foreach($r as $rr) {
$k = $rr['k']; $k = $rr['k'];
$c = $rr['cat']; $c = $rr['cat'];
if(! array_key_exists($c,$a->config[$xchan])) { if(! array_key_exists($c, $a->config[$xchan])) {
$a->config[$xchan][$c] = array(); $a->config[$xchan][$c] = array();
$a->config[$xchan][$c]['config_loaded'] = true; $a->config[$xchan][$c]['config_loaded'] = true;
} }
$a->config[$xchan][$c][$k] = $rr['v']; $a->config[$xchan][$c][$k] = $rr['v'];
} }
} }
} }
/**
* @brief Get a particular observer's config variable given the category
* name ($family) and a key.
function get_xconfig($xchan,$family, $key) { *
* Get a particular observer's config value from the given category ($family)
* and the $key from a cached storage in $a->config[$xchan].
*
* Returns false if not set.
*
* @param string $xchan
* The observer's hash
* @param string $family
* The category of the configuration value
* @param string $key
* The configuration key to query
* @return mixed Stored $value or false if it does not exist
*/
function get_xconfig($xchan, $family, $key) {
global $a; global $a;
if(! $xchan) if(! $xchan)
return false; return false;
if(! array_key_exists($xchan,$a->config)) if(! array_key_exists($xchan, $a->config))
load_xconfig($xchan); load_xconfig($xchan);
if((! array_key_exists($family,$a->config[$xchan])) || (! array_key_exists($key,$a->config[$xchan][$family]))) if((! array_key_exists($family, $a->config[$xchan])) || (! array_key_exists($key, $a->config[$xchan][$family])))
return false; return false;
return ((! is_array($a->config[$xchan][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$xchan][$family][$key])) return ((! is_array($a->config[$xchan][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$xchan][$family][$key]))
? unserialize($a->config[$xchan][$family][$key]) ? unserialize($a->config[$xchan][$family][$key])
: $a->config[$xchan][$family][$key] : $a->config[$xchan][$family][$key]
); );
} }
/**
function set_xconfig($xchan,$family,$key,$value) { * @brief Sets a configuration value for an observer.
*
* Stores a config value ($value) in the category ($family) under the key ($key)
* for the observer's $xchan hash.
*
* Please do not store booleans - convert to 0/1 integer values!
*
* @param string $xchan
* The observer's hash
* @param string $family
* The category of the configuration value
* @param string $key
* The configuration key to set
* @return mixed Stored $value or false
*/
function set_xconfig($xchan, $family, $key, $value) {
global $a; global $a;
// manage array value // manage array value
$dbvalue = ((is_array($value)) ? serialize($value) : $value); $dbvalue = ((is_array($value)) ? serialize($value) : $value);
$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue); $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue);
if(get_xconfig($xchan,$family,$key) === false) { if(get_xconfig($xchan, $family, $key) === false) {
if(! array_key_exists($xchan,$a->config)) if(! array_key_exists($xchan, $a->config))
$a->config[$xchan] = array(); $a->config[$xchan] = array();
if(! array_key_exists($family,$a->config[$xchan])) if(! array_key_exists($family, $a->config[$xchan]))
$a->config[$xchan][$family] = array(); $a->config[$xchan][$family] = array();
$a->config[$xchan][$family][$key] = $value; $a->config[$xchan][$family][$key] = $value;
@ -341,22 +495,32 @@ function set_xconfig($xchan,$family,$key,$value) {
if($ret) if($ret)
return $value; return $value;
return $ret; return $ret;
} }
/**
function del_xconfig($xchan,$family,$key) { * @brief Deletes the given key from the observer's config.
*
* Removes the configured value from the stored cache in $a->config[$xchan]
* and removes it from the database.
*
* @param string $xchan
* The observer's hash
* @param string $family
* The category of the configuration value
* @param string $key
* The configuration key to delete
* @return mixed
*/
function del_xconfig($xchan, $family, $key) {
global $a; global $a;
if(x($a->config[$xchan][$family],$key)) $ret = false;
if(x($a->config[$xchan][$family], $key))
unset($a->config[$xchan][$family][$key]); unset($a->config[$xchan][$family][$key]);
$ret = q("DELETE FROM `xconfig` WHERE `xchan` = '%s' AND `cat` = '%s' AND `k` = '%s' LIMIT 1", $ret = q("DELETE FROM `xconfig` WHERE `xchan` = '%s' AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
dbesc($xchan), dbesc($xchan),
dbesc($family), dbesc($family),
dbesc($key) dbesc($key)
); );
return $ret; return $ret;
} }

16
include/identity.php
View File

@ -518,10 +518,26 @@ function identity_basic_export($channel_id, $items = false) {
$ret['photo'] = array('type' => $r[0]['type'], 'data' => base64url_encode($r[0]['data'])); $ret['photo'] = array('type' => $r[0]['type'], 'data' => base64url_encode($r[0]['data']));
} }
$r = q("select * from obj where obj_channel = %d",
intval($channel_id)
);
if($r)
$ret['obj'] = $r;
if(! $items) if(! $items)
return $ret; return $ret;
$r = q("select likes.*, item.mid from likes left join item on likes.iid = item.id where likes.channel_id = %d",
intval($channel_id)
);
if($r)
$ret['likes'] = $r;
$r = q("select item_id.*, item.mid from item_id left join item on item_id.iid = item.id where item_id.uid = %d", $r = q("select item_id.*, item.mid from item_id left join item on item_id.iid = item.id where item_id.uid = %d",
intval($channel_id) intval($channel_id)
); );

52
mod/p.php Normal file
View File

@ -0,0 +1,52 @@
<?php /** @file */
require_once('include/bb2diaspora.php');
// used in Diaspora communications to provide a server copy of a sent post in XML format.
function p_init(&$a) {
if(argc() < 2)
http_status_exit(401);
$mid = str_replace('.xml','',argv(1));
$r = q("select * from item where mid = '%s' and (item_flags & %d) and item_private = 0 limit 1",
dbesc($mid),
intval(ITEM_WALL)
);
if((! $r) || (! perm_is_allowed($r[0]['uid'],'','view_stream')))
http_status_exit(404);
$c = q("select * from channel where channel_id = %d limit 1",
intval($r[0]['uid'])
);
if(! $c)
http_status_exit(404);
$myaddr = $c[0]['channel_address'] . '@' . $a->get_hostname();
$item = $r[0];
$title = $item['title'];
$body = bb2diaspora_itembody($item);
$created = datetime_convert('UTC','UTC',$item['created'],'Y-m-d H:i:s \U\T\C');
$tpl = get_markup_template('diaspora_post.tpl');
$msg = replace_macros($tpl, array(
'$body' => xmlify($body),
'$guid' => $item['mid'],
'$handle' => xmlify($myaddr),
'$public' => 'true',
'$created' => $created,
'$provider' => (($item['app']) ? $item['app'] : 'redmatrix')
));
header('Content-type: text/xml');
echo $msg;
killme();
}

4
mod/photos.php
View File

@ -654,7 +654,7 @@ function photos_content(&$a) {
); );
$o .= '<div class="section-title-wrapper">'; $o .= '<div class="section-title-wrapper">';
$o .= '<h3>' . $album . '</h3>'; $o .= '<h2>' . $album . '</h2>';
$o .= '<div class="section-title-submenu">'; $o .= '<div class="section-title-submenu">';
if($cmd === 'edit') { if($cmd === 'edit') {
if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) { if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
@ -1238,7 +1238,7 @@ function photos_content(&$a) {
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
'$title' => t('Recent Photos'), '$title' => t('Recent Photos'),
'$can_post' => $can_post, '$can_post' => $can_post,
'$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'), '$upload' => array(t('Upload'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'),
'$photos' => $photos, '$photos' => $photos,
)); ));

52
mod/siteinfo.php
View File

@ -48,6 +48,51 @@ function siteinfo_init(&$a) {
$site_info = get_config('system','info'); $site_info = get_config('system','info');
$site_name = get_config('system','sitename'); $site_name = get_config('system','sitename');
// Statistics (from statistics.json plugin)
$r = q("select count(channel_id) as channels_total from channel left join account on account_id = channel_account_id
where account_flags = 0 ");
if($r)
$channels_total = $r[0]['channels_total'];
$r = q("select channel_id from channel left join account on account_id = channel_account_id
where account_flags = 0 and account_lastlog > UTC_TIMESTAMP - INTERVAL 6 MONTH");
if($r) {
$s = '';
foreach($r as $rr) {
if($s)
$s .= ',';
$s .= intval($rr['channel_id']);
}
$x = q("select uid from item where uid in ( $s ) and (item_flags & %d) and created > UTC_TIMESTAMP - INTERVAL 6 MONTH group by uid",
intval(ITEM_WALL)
);
if($x)
$channels_active_halfyear = count($x);
}
$r = q("select channel_id from channel left join account on account_id = channel_account_id
where account_flags = 0 and account_lastlog > UTC_TIMESTAMP - INTERVAL 1 MONTH");
if($r) {
$s = '';
foreach($r as $rr) {
if($s)
$s .= ',';
$s .= intval($rr['channel_id']);
}
$x = q("select uid from item where uid in ( $s ) and ( item_flags & %d ) and created > UTC_TIMESTAMP - INTERVAL 1 MONTH group by uid",
intval(ITEM_WALL)
);
if($x)
$channels_active_monthly = count($x);
}
$posts = q("SELECT COUNT(*) AS local_posts FROM `item` WHERE (item_flags & %d) ",
intval(ITEM_WALL)
);
if (is_array($posts))
$local_posts = $posts[0]["local_posts"];
$data = Array( $data = Array(
'version' => RED_VERSION, 'version' => RED_VERSION,
@ -61,9 +106,12 @@ function siteinfo_init(&$a) {
'admin' => $admin, 'admin' => $admin,
'site_name' => (($site_name) ? $site_name : ''), 'site_name' => (($site_name) ? $site_name : ''),
'platform' => RED_PLATFORM, 'platform' => RED_PLATFORM,
'info' => (($site_info) ? $site_info : '') 'info' => (($site_info) ? $site_info : ''),
'channels_total' => $channels_total,
'channels_active_halfyear' => $channels_active_halfyear,
'channels_active_monthly' => $channels_active_monthly,
'local_posts' => $local_posts
); );
json_return_and_die($data); json_return_and_die($data);
} }
} }

2
version.inc
View File

@ -1 +1 @@
2014-09-26.810 2014-09-27.811

12
view/css/bootstrap-red.css vendored
View File

@ -1,17 +1,5 @@
/* override some bootstrap settings */ /* override some bootstrap settings */
h1, h2 {
font-size: 1.583em;
}
h3, h4 {
font-size: 1.334em;
}
h5, h6 {
font-size: 0.75rem;
}
/* nav overrides */ /* nav overrides */
nav .badge { nav .badge {

4
view/css/conversation.css
View File

@ -111,10 +111,6 @@
font-size: 1.319em; font-size: 1.319em;
} }
.wall-item-title {
font-size: $font_size;
}
.wall-item-title h3, .wall-item-content h3, .wall-item-content h4 { .wall-item-title h3, .wall-item-content h3, .wall-item-content h4 {
font-size: 1.112em; font-size: 1.112em;
} }

39
view/theme/redbasic/css/style.css
View File

@ -23,6 +23,19 @@ body {
margin: 0px; margin: 0px;
height: 100%; height: 100%;
} }
h1, .h1, h2, .h2 {
font-size: 1.667em;
}
h3, .h3, h4, .h4 {
font-size: 1.334em;
}
h5, .h5, h6, .h6 {
font-size: 0.75rem;
}
.jslider { .jslider {
font-family: arial,freesans,sans-serif; font-family: arial,freesans,sans-serif;
} }
@ -60,6 +73,15 @@ a:hover, .fakelink:hover { color: $link_colour; text-decoration: underline; }
cursor: pointer; cursor: pointer;
} }
a.btn-default {
color: #333;
}
a.btn-success {
color: #fff;
font-weight: normal;
}
input[type="text"], input[type="text"],
input[type="password"], input[type="password"],
@ -1966,6 +1988,10 @@ img.mail-list-sender-photo {
/* conversation */ /* conversation */
.wall-item-title {
font-size: $font_size;
}
.hide-comments-outer, .hide-comments-outer,
.thread-wrapper .wall-item-comment-wrapper, .thread-wrapper .wall-item-comment-wrapper,
.wall-item-content-wrapper.comment { .wall-item-content-wrapper.comment {
@ -2398,16 +2424,16 @@ blockquote {
.btn-default { .btn-default {
background-color: $editbuttons_bgcolour; background-color: $editbuttons_bgcolour;
border-color: $editbuttons_bordercolour; border-color: $editbuttons_bordercolour;
color: $editbuttons_colour; color: $editbuttons_colour;
text-shadow: none; text-shadow: none;
box-shadow: none; box-shadow: none;
} }
.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active { .btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active {
background-color: $editbuttons_bghover; background-color: $editbuttons_bghover;
border-color: $editbuttons_bordercolourhover; border-color: $editbuttons_bordercolourhover;
color: $input_colourhover; color: $input_colourhover;
text-decoration: $input_decohover; text-decoration: $input_decohover;
} }
.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active { .btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
@ -2434,7 +2460,7 @@ blockquote {
margin-bottom: 10px; margin-bottom: 10px;
} }
.section-title-wrapper h3 { .section-title-wrapper h2 {
margin-top: 0px; margin-top: 0px;
margin-bottom: 0px; margin-bottom: 0px;
} }
@ -2447,6 +2473,7 @@ blockquote {
margin-right: 10px; margin-right: 10px;
} }
@media screen and (max-width: 767px) { @media screen and (max-width: 767px) {
aside#region_1 { aside#region_1 {
background: rgba(0, 0, 0, .1); background: rgba(0, 0, 0, .1);

3
view/tpl/photo_albums.tpl
View File

@ -4,10 +4,11 @@
{{if $upload}} {{if $upload}}
<li><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></li> <li><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></li>
{{/if}} {{/if}}
<li><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >Recent Photos</a></li>
{{if $albums}} {{if $albums}}
{{foreach $albums as $al}} {{foreach $albums as $al}}
{{if $al.text}} {{if $al.text}}
<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}<span class="badge pull-right">{{$al.total}}</span></a></li> <li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge pull-right">{{$al.total}}</span>{{$al.text}}</a></li>
{{/if}} {{/if}}
{{/foreach}} {{/foreach}}

6
view/tpl/photos_recent.tpl
View File

@ -1,5 +1,9 @@
<div class="section-title-wrapper"> <div class="section-title-wrapper">
<h3>{{$title}}</h3> {{if $can_post}}
<a class="btn btn-xs btn-success pull-right" href="{{$upload.1}}"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</a>
{{/if}}
<h2>{{$title}}</h2>
<div class="clear"></div>
</div> </div>
<div id="photo-album-contents"> <div id="photo-album-contents">
{{foreach $photos as $photo}} {{foreach $photos as $photo}}