Merge pull request #3075 from Hypolite/issue/#3039-theme

Normalize App parameter declaration (view folder)
This commit is contained in:
Michael Vogel 2017-01-11 07:50:49 +01:00 committed by GitHub
commit 38a41eefd2
12 changed files with 75 additions and 75 deletions

View file

@ -3,7 +3,7 @@
* Theme settings
*/
function theme_content(App &$a){
function theme_content(App $a) {
if (!local_user()) {
return;
}
@ -14,7 +14,7 @@ function theme_content(App &$a){
return clean_form($a, $colorset, $user);
}
function theme_post(App &$a){
function theme_post(App $a) {
if (! local_user()) {
return;
}
@ -24,21 +24,21 @@ function theme_post(App &$a){
}
}
function theme_admin(App &$a){
function theme_admin(App $a) {
$colorset = get_config( 'duepuntozero', 'colorset');
$user = false;
return clean_form($a, $colorset, $user);
}
function theme_admin_post(App &$a){
function theme_admin_post(App $a) {
if (isset($_POST['duepuntozero-settings-submit'])){
set_config('duepuntozero', 'colorset', $_POST['duepuntozero_colorset']);
}
}
/// @TODO $a is no longer used
function clean_form(&$a, &$colorset, $user){
function clean_form(App $a, &$colorset, $user) {
$colorset = array(
'default' =>t('default'),
'greenzero' =>t('greenzero'),

View file

@ -1,6 +1,6 @@
<?php
function duepuntozero_init(App &$a) {
function duepuntozero_init(App $a) {
set_template_engine($a, 'smarty3');

View file

@ -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,7 +36,7 @@ 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"]);

View file

@ -13,7 +13,7 @@
*
* @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"))) {

View file

@ -11,7 +11,7 @@ $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,7 +63,7 @@ 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
@ -71,10 +71,10 @@ function frio_uninstall() {
* 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) {
@ -136,7 +136,7 @@ function frio_item_photo_menu($a, &$arr){
* @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 = "";

View file

@ -9,7 +9,7 @@
* Maintainer: Zach P <techcity@f.shmuz.in>
*/
function frost_mobile_init(App &$a) {
function frost_mobile_init(App $a) {
$a->sourcename = 'Friendica mobile web';
$a->videowidth = 250;
$a->videoheight = 200;
@ -18,7 +18,7 @@ function frost_mobile_init(App &$a) {
set_template_engine($a, 'smarty3');
}
function frost_mobile_content_loaded(App &$a) {
function frost_mobile_content_loaded(App $a) {
// I could do this in style.php, but by having the CSS in a file the browser will cache it,
// making pages load faster

View file

@ -9,14 +9,14 @@
* Maintainer: Zach P <techcity@f.shmuz.in>
*/
function frost_init(App &$a) {
function frost_init(App $a) {
$a->videowidth = 400;
$a->videoheight = 330;
$a->theme_thread_allow = false;
set_template_engine($a, 'smarty3');
}
function frost_content_loaded(App &$a) {
function frost_content_loaded(App $a) {
// I could do this in style.php, but by having the CSS in a file the browser will cache it,
// making pages load faster
@ -43,7 +43,7 @@ function frost_uninstall() {
logger("uninstalled theme frost");
}
function frost_item_photo_links(&$a, &$body_info) {
function frost_item_photo_links(App $a, &$body_info) {
require_once('include/Photo.php');
$phototypes = Photo::supportedTypes();

View file

@ -3,7 +3,7 @@
* Theme settings
*/
function theme_content(App &$a){
function theme_content(App $a) {
if (!local_user()) {
return;
}
@ -16,7 +16,7 @@ function theme_content(App &$a){
return quattro_form($a,$align, $color, $tfs, $pfs);
}
function theme_post(App &$a){
function theme_post(App $a) {
if (! local_user()) {
return;
}
@ -29,7 +29,7 @@ function theme_post(App &$a){
}
}
function theme_admin(App &$a){
function theme_admin(App $a) {
$align = get_config('quattro', 'align' );
$color = get_config('quattro', 'color' );
$tfs = get_config("quattro","tfs");
@ -38,7 +38,7 @@ function theme_admin(App &$a){
return quattro_form($a,$align, $color, $tfs, $pfs);
}
function theme_admin_post(App &$a){
function theme_admin_post(App $a) {
if (isset($_POST['quattro-settings-submit'])){
set_config('quattro', 'align', $_POST['quattro_align']);
set_config('quattro', 'color', $_POST['quattro_color']);
@ -48,7 +48,7 @@ function theme_admin_post(App &$a){
}
/// @TODO $a is no longer used here
function quattro_form(App &$a, $align, $color, $tfs, $pfs){
function quattro_form(App $a, $align, $color, $tfs, $pfs) {
$colors = array(
"dark" => "Quattro",
"lilac" => "Lilac",

View file

@ -7,7 +7,7 @@
* Maintainer: Tobias <https://diekershoff.homeunix.net/friendica/profile/tobias>
*/
function quattro_init(App &$a) {
function quattro_init(App $a) {
$a->page['htmlhead'] .= '<script src="'.App::get_baseurl().'/view/theme/quattro/tinycon.min.js"></script>';
$a->page['htmlhead'] .= '<script src="'.App::get_baseurl().'/view/theme/quattro/js/quattro.js"></script>';;
}

View file

@ -10,7 +10,7 @@
* Screenshot: <a href="screenshot.png">Screenshot</a>
*/
function smoothly_init(App &$a) {
function smoothly_init(App $a) {
set_template_engine($a, 'smarty3');
$cssFile = null;

View file

@ -5,7 +5,7 @@
function theme_content(App &$a){
function theme_content(App $a) {
if (!local_user()) {
return;
}
@ -35,7 +35,7 @@ function theme_content(App &$a){
$show_services, $show_friends, $show_lastusers);
}
function theme_post(App &$a){
function theme_post(App $a) {
if (! local_user()) {
return;
}
@ -52,7 +52,7 @@ function theme_post(App &$a){
}
function theme_admin(App &$a){
function theme_admin(App $a) {
if (!function_exists('get_vier_config'))
return;
@ -81,7 +81,7 @@ function theme_admin(App &$a){
return $o;
}
function theme_admin_post(App &$a){
function theme_admin_post(App $a) {
if (isset($_POST['vier-settings-submit'])){
set_config('vier', 'style', $_POST['vier_style']);
set_config('vier', 'show_pages', $_POST['vier_show_pages']);
@ -95,7 +95,7 @@ function theme_admin_post(App &$a){
}
/// @TODO $a is no longer used
function vier_form(&$a, $style, $show_pages, $show_profiles, $show_helpers, $show_services, $show_friends, $show_lastusers){
function vier_form(App $a, $style, $show_pages, $show_profiles, $show_helpers, $show_services, $show_friends, $show_lastusers) {
$styles = array(
"plus"=>"Plus",
"breathe"=>"Breathe",

View file

@ -13,7 +13,7 @@ require_once("include/plugin.php");
require_once("include/socgraph.php");
require_once("mod/proxy.php");
function vier_init(App &$a) {
function vier_init(App $a) {
$a->theme_events_in_profile = false;