Normalize App parameter declaration (view folder)
This commit is contained in:
Hypolite Petovan
parent
ee39aba490
commit
623479a346
12 changed files with 76 additions and 76 deletions
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
require_once('view/theme/frio/php/Image.php');
|
||||
|
||||
function theme_content(App &$a) {
|
||||
function theme_content(App $a) {
|
||||
if (!local_user()) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -16,10 +16,10 @@ function theme_content(App &$a) {
|
|||
$arr["background_image"] = get_pconfig(local_user(),'frio', 'background_image' );
|
||||
$arr["bg_image_option"] = get_pconfig(local_user(),'frio', 'bg_image_option' );
|
||||
|
||||
return frio_form($a, $arr);
|
||||
return frio_form($arr);
|
||||
}
|
||||
|
||||
function theme_post(App &$a) {
|
||||
function theme_post(App $a) {
|
||||
if (!local_user()) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -36,9 +36,9 @@ function theme_post(App &$a) {
|
|||
}
|
||||
}
|
||||
|
||||
function frio_form(&$a, $arr) {
|
||||
function frio_form($arr) {
|
||||
require_once("view/theme/frio/php/schema.php");
|
||||
|
||||
|
||||
$scheme_info = get_schema_info($arr["schema"]);
|
||||
$disable = $scheme_info["overwrites"];
|
||||
if (!is_array($disable)) $disable = array();
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
/**
|
||||
* @file view/theme/frio/php/frio_boot.php
|
||||
*
|
||||
*
|
||||
* @brief This file contains functions for page contstruction
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
/**
|
||||
* @brief Load page template in dependence of the template mode
|
||||
*
|
||||
*
|
||||
* @todo Check if this is really needed.
|
||||
*/
|
||||
function load_page(App &$a) {
|
||||
function load_page(App $a) {
|
||||
if(isset($_GET["mode"]) AND ($_GET["mode"] == "minimal")) {
|
||||
require "view/theme/frio/minimal.php";
|
||||
} elseif((isset($_GET["mode"]) AND ($_GET["mode"] == "none"))) {
|
||||
|
|
@ -27,16 +27,16 @@ function load_page(App &$a) {
|
|||
require_once(str_replace('theme/' . current_theme() . '/', '', $template));
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @brief Check if page is a modal page
|
||||
*
|
||||
*
|
||||
* This function checks if $_REQUEST['pagename'] is
|
||||
* a defined in a $modalpages
|
||||
*
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
function is_modal() {
|
||||
|
|
@ -48,16 +48,16 @@ function is_modal() {
|
|||
$is_modal = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return $is_modal;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Array with modalpages
|
||||
*
|
||||
*
|
||||
* The array contains the page names of the pages
|
||||
* which should displayed as modals
|
||||
*
|
||||
*
|
||||
* @return array Pagenames as path
|
||||
*/
|
||||
function get_modalpage_list() {
|
||||
|
|
@ -74,10 +74,10 @@ function get_modalpage_list() {
|
|||
|
||||
/**
|
||||
* @brief Array with standard pages
|
||||
*
|
||||
*
|
||||
* The array contains the page names of the pages
|
||||
* which should displayed as standard-page
|
||||
*
|
||||
*
|
||||
* @return array Pagenames as path
|
||||
*/
|
||||
function get_standard_page_list() {
|
||||
|
|
@ -91,10 +91,10 @@ function get_standard_page_list() {
|
|||
|
||||
/**
|
||||
* @brief Check if page is standard page
|
||||
*
|
||||
*
|
||||
* This function checks if $_REQUEST['pagename'] is
|
||||
* a defined $standardpages
|
||||
*
|
||||
*
|
||||
* @param string $pagetitle Title of the actual page
|
||||
* @return bool
|
||||
*/
|
||||
|
|
@ -107,12 +107,12 @@ function is_standard_page($pagetitle) {
|
|||
$is_standard_page = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return $is_standard_page;
|
||||
}
|
||||
/**
|
||||
* @brief Get the typ of the page
|
||||
*
|
||||
*
|
||||
* @param type $pagetitle
|
||||
* @return string
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
* Description: Bootstrap V3 theme. The theme is currently under construction, so it is far from finished. For further information have a look at the <a href="https://github.com/friendica/friendica/tree/develop/view/theme/frio/README.md">ReadMe</a>.
|
||||
* Version: V.0.7
|
||||
* Author: Rabuzarus <https://friendica.kommune4.de/profile/rabuzarus>
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
$frio = "view/theme/frio";
|
||||
|
||||
global $frio;
|
||||
|
||||
function frio_init(App &$a) {
|
||||
function frio_init(App $a) {
|
||||
|
||||
// disable the events module link in the profile tab
|
||||
$a->theme_events_in_profile = false;
|
||||
|
|
@ -63,18 +63,18 @@ function frio_uninstall() {
|
|||
logger("uninstalled theme frio");
|
||||
}
|
||||
/**
|
||||
* @brief Replace friendica photo links
|
||||
*
|
||||
* @brief Replace friendica photo links hook
|
||||
*
|
||||
* This function does replace the links to photos
|
||||
* of other friendica users. Original the photos are
|
||||
* linked to the photo page. Now they will linked directly
|
||||
* to the photo file. This function is nessesary to use colorbox
|
||||
* in the network stream
|
||||
*
|
||||
* @param App $a
|
||||
*
|
||||
* @param App $a Unused but required by hook definition
|
||||
* @param array $body_info The item and its html output
|
||||
*/
|
||||
function frio_item_photo_links(&$a, &$body_info) {
|
||||
function frio_item_photo_links(App $a, &$body_info) {
|
||||
require_once('include/Photo.php');
|
||||
|
||||
$phototypes = Photo::supportedTypes();
|
||||
|
|
@ -104,16 +104,16 @@ function frio_item_photo_links(&$a, &$body_info) {
|
|||
}
|
||||
|
||||
/**
|
||||
* @brief Replace links of the item_photo_menu
|
||||
*
|
||||
* @brief Replace links of the item_photo_menu hook
|
||||
*
|
||||
* This function replaces the original poke and the message links
|
||||
* to call the addToModal javascript function so this pages can
|
||||
* be loaded in a bootstrap modal
|
||||
*
|
||||
* @param app $a The app data
|
||||
*
|
||||
* @param App $a Unused but required by the hook definition
|
||||
* @param array $arr Contains item data and the original photo_menu
|
||||
*/
|
||||
function frio_item_photo_menu($a, &$arr){
|
||||
function frio_item_photo_menu(App $a, &$arr) {
|
||||
|
||||
foreach($arr["menu"] as $k =>$v) {
|
||||
if(strpos($v,'poke/?f=&c=') === 0 || strpos($v,'message/new/') === 0) {
|
||||
|
|
@ -126,17 +126,17 @@ function frio_item_photo_menu($a, &$arr){
|
|||
|
||||
/**
|
||||
* @brief Replace links of the contact_photo_menu
|
||||
*
|
||||
*
|
||||
* This function replaces the original poke and the message links
|
||||
* to call the addToModal javascript function so this pages can
|
||||
* be loaded in a bootstrap modal
|
||||
* Additionally the profile, status and photo page links will be changed
|
||||
* to don't open in a new tab if the contact is a friendica contact.
|
||||
*
|
||||
*
|
||||
* @param app $a The app data
|
||||
* @param array $args Contains contact data and the original photo_menu
|
||||
*/
|
||||
function frio_contact_photo_menu($a, &$args){
|
||||
function frio_contact_photo_menu(App $a, &$args){
|
||||
|
||||
$pokelink = "";
|
||||
$pmlink = "";
|
||||
|
|
@ -152,7 +152,7 @@ function frio_contact_photo_menu($a, &$args){
|
|||
// friendicas "magic-link" which indicates a friendica user on froreign
|
||||
// friendica servers as remote user or visitor
|
||||
//
|
||||
// The value for opening in a new tab is e.g. when
|
||||
// The value for opening in a new tab is e.g. when
|
||||
// $args["menu"]["status"][2] is true. If the value of the [2] key is true
|
||||
// and if it's a friendica contact we set it to false
|
||||
foreach($args["menu"] as $k =>$v) {
|
||||
|
|
@ -176,15 +176,15 @@ function frio_contact_photo_menu($a, &$args){
|
|||
|
||||
/**
|
||||
* @brief Construct remote nav menu
|
||||
*
|
||||
*
|
||||
* It creates a remote baseurl form $_SESSION for remote users and friendica
|
||||
* visitors. This url will be added to some of the nav links. With this behaviour
|
||||
* visitors. This url will be added to some of the nav links. With this behaviour
|
||||
* the user will come back to her/his own pages on his/her friendica server.
|
||||
* Not all possible links are available (notifications, administrator, manage,
|
||||
* notes aren't available because we have no way the check remote permissions)..
|
||||
* Some links will point to the local pages because the user would expect
|
||||
* local page (these pages are: search, community, help, apps, directory).
|
||||
*
|
||||
*
|
||||
* @param app $a The App class
|
||||
* @param array $nav The original nav menu
|
||||
*/
|
||||
|
|
@ -196,11 +196,11 @@ function frio_remote_nav($a,&$nav) {
|
|||
|
||||
// split up the url in it's parts (protocol,domain/directory, /profile/, nickname
|
||||
// I'm not familiar with regex, so someone might find a better solutionen
|
||||
//
|
||||
//
|
||||
// E.g $homelink = 'https://friendica.domain.com/profile/mickey' should result in an array
|
||||
// with 0 => 'https://friendica.domain.com/profile/mickey' 1 => 'https://',
|
||||
// 2 => 'friendica.domain.com' 3 => '/profile/' 4 => 'mickey'
|
||||
//
|
||||
//
|
||||
//$server_url = preg_match('/^(https?:\/\/.*?)\/profile\//2', $homelink);
|
||||
preg_match('/^(https?:\/\/)?(.*?)(\/profile\/)(.*)/', $homelink, $url_parts);
|
||||
|
||||
|
|
@ -220,7 +220,7 @@ function frio_remote_nav($a,&$nav) {
|
|||
$server_url = '';
|
||||
// user info
|
||||
$r = q("SELECT `micro` FROM `contact` WHERE `uid` = %d AND `self` = 1", intval($a->user['uid']));
|
||||
|
||||
|
||||
$r[0]['photo'] = (dbm::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : "images/person-48.jpg");
|
||||
$r[0]['name'] = $a->user['username'];
|
||||
|
||||
|
|
@ -263,14 +263,14 @@ function frio_remote_nav($a,&$nav) {
|
|||
}
|
||||
/**
|
||||
* @brief: Search for contacts
|
||||
*
|
||||
*
|
||||
* This function search for a users contacts. The code is copied from contact search
|
||||
* in /mod/contacts.php. With this function the contacts will permitted to acl_lookup()
|
||||
* and can grabbed as json. For this we use the type="r". This is usful to to let js
|
||||
* and can grabbed as json. For this we use the type="r". This is usful to to let js
|
||||
* grab the contact data.
|
||||
* We use this to give the data to textcomplete and have a filter function at the
|
||||
* contact page.
|
||||
*
|
||||
*
|
||||
* @param App $a The app data @TODO Unused
|
||||
* @param array $results The array with the originals from acl_lookup()
|
||||
*/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue