[various] Replace remaining $a->page by DI::page()

diff --git a/calc/calc.php b/calc/calc.php
index f60682b048d63a7481579048818f9867e5bcf3ee..61e9c5db806e2f88133ecc6078181de4bedb52b8 100644 (file)
--- a/calc/calc.php
+++ b/calc/calc.php
@@ -1,363 +1,364 @@
-<?php\r
-/**\r
- * Name: Calculator App\r
- * Description: Simple Calculator Application\r
- * Version: 1.0\r
- * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>\r
- */\r
-use Friendica\Core\Hook;\r
-\r
-function calc_install() {\r
-       Hook::register('app_menu', 'addon/calc/calc.php', 'calc_app_menu');\r
-}\r
-\r
-function calc_uninstall() {\r
-       Hook::unregister('app_menu', 'addon/calc/calc.php', 'calc_app_menu');\r
-\r
-}\r
-\r
-function calc_app_menu($a,&$b) {\r
-       $b['app_menu'][] = '<div class="app-title"><a href="calc">Calculator</a></div>'; \r
-}\r
-\r
-\r
-function calc_module() {}\r
-\r
-\r
-\r
-\r
-function calc_init($a) {\r
-\r
-$x = <<< EOT\r
-\r
-<script language="JavaScript">\r
-/**************************************\r
- * www.FemaleNerd.com         *\r
- **************************************/\r
-\r
-// Declare global variables\r
-var displayText = ""\r
-var num1\r
-var num2\r
-var operatorType\r
-\r
-// Write to display\r
-function addDisplay(n){\r
-   id = document.getElementById("display");\r
-id.value = ""\r
-displayText += n\r
-id.value = displayText\r
-}\r
-\r
-// Addition\r
-function addNumbers() {\r
-if (displayText == "") {\r
-  displayText = result\r
- }\r
-num1 = parseFloat(displayText)\r
-operatorType = "add"\r
-displayText = ""\r
-}\r
-\r
-// Subtraction\r
-function subtractNumbers() {\r
-if (displayText == "") {\r
-  displayText = result\r
- }\r
-num1 = parseFloat(displayText)\r
-operatorType = "subtract"\r
-displayText = ""\r
-}\r
-\r
-// Multiplication\r
-function multiplyNumbers() {\r
-if (displayText == "") {\r
-  displayText = result\r
- }\r
-num1 = parseFloat(displayText)\r
-operatorType = "multiply"\r
-displayText = ""\r
-}\r
-\r
-// Division\r
-function divideNumbers() {\r
-if (displayText == "") {\r
-  displayText = result\r
- }\r
-num1 = parseFloat(displayText)\r
-operatorType = "divide"\r
-displayText = ""\r
-}\r
-\r
-// Sine\r
-function sin() {\r
-   id = document.getElementById("display");\r
-if (displayText == "") {\r
-  num1 = result\r
-  }\r
-else {\r
-  num1 = parseFloat(displayText)\r
-  }\r
-if (num1 != "") {\r
-  result = Math.sin(num1)\r
-  id.value = result\r
-  displayText = ""\r
-  }\r
-else {\r
-  alert("Please write the number first")\r
-  }\r
-}\r
-\r
-// Cosine\r
-function cos() {\r
-   id = document.getElementById("display");\r
-if (displayText == "") {\r
-  num1 = result\r
-  }\r
-else {\r
-  num1 = parseFloat(displayText)\r
-  }\r
-if (num1 != "") {\r
-  result = Math.cos(num1)\r
-  id.value = result\r
-  displayText = ""\r
-  }\r
-else {\r
-  alert("Please write the number first")\r
-  }\r
-}\r
-\r
-// ArcSine\r
-function arcSin() {\r
-   id = document.getElementById("display");\r
-if (displayText == "") {\r
-  num1 = result\r
-  }\r
-else {\r
-  num1 = parseFloat(displayText)\r
-  }\r
-if (num1 != "") {\r
-  result = Math.asin(num1)\r
-  id.value = result\r
-  displayText = ""\r
-  }\r
-else {\r
-  alert("Please write the number first")\r
-  }\r
-}\r
-\r
-// ArcCosine\r
-function arcCos() {\r
-   id = document.getElementById("display");\r
-if (displayText == "") {\r
-  num1 = result\r
-  }\r
-else {\r
-  num1 = parseFloat(displayText)\r
-  }\r
-if (num1 != "") {\r
-  result = Math.acos(num1)\r
-  id.value = result\r
-  displayText = ""\r
-  }\r
-else {\r
-  alert("Please write the number first")\r
-  }\r
-}\r
-\r
-// Square root\r
-function sqrt() {\r
-   id = document.getElementById("display");\r
-if (displayText == "") {\r
-  num1 = result\r
-  }\r
-else {\r
-  num1 = parseFloat(displayText)\r
-  }\r
-if (num1 != "") {\r
-  result = Math.sqrt(num1)\r
-  id.value = result\r
-  displayText = ""\r
-  }\r
-else {\r
-  alert("Please write the number first")\r
-  }\r
-}\r
-\r
-// Square number (number to the power of two)\r
-function square() {\r
-   id = document.getElementById("display");\r
-if (displayText == "") {\r
-  num1 = result\r
-  }\r
-else {\r
-  num1 = parseFloat(displayText)\r
-  }\r
-if (num1 != "") {\r
-  result = num1 * num1\r
-  id.value = result\r
-  displayText = ""\r
-  }\r
-else {\r
-  alert("Please write the number first")\r
-  }\r
-}\r
-\r
-// Convert degrees to radians\r
-function degToRad() {\r
-   id = document.getElementById("display");\r
-if (displayText == "") {\r
-  num1 = result\r
-  }\r
-else {\r
-  num1 = parseFloat(displayText)\r
-  }\r
-if (num1 != "") {\r
-  result = num1 * Math.PI / 180\r
-  id.value = result\r
-  displayText = ""\r
-  }\r
-else {\r
-  alert("Please write the number first")\r
-  }\r
-}\r
-\r
-// Convert radians to degrees\r
-function radToDeg() {\r
-   id = document.getElementById("display");\r
-if (displayText == "") {\r
-  num1 = result\r
-  }\r
-else {\r
-  num1 = parseFloat(displayText)\r
-  }\r
-if (num1 != "") {\r
-  result = num1 * 180 / Math.PI\r
-  id.value = result\r
-  displayText = ""\r
-  }\r
-else {\r
-  alert("Please write the number first")\r
-  }\r
-}\r
-\r
-// Calculations\r
-function calculate() {\r
-   id = document.getElementById("display");\r
-\r
-if (displayText != "") {\r
-  num2 = parseFloat(displayText)\r
-// Calc: Addition\r
-  if (operatorType == "add") {\r
-    result = num1 + num2\r
-    id.value = result\r
-    }\r
-// Calc: Subtraction\r
-  if (operatorType == "subtract") {\r
-    result = num1 - num2\r
-    id.value = result\r
-    }\r
-// Calc: Multiplication\r
-  if (operatorType == "multiply") {\r
-    result = num1 * num2\r
-    id.value = result\r
-    }\r
-// Calc: Division\r
-  if (operatorType == "divide") {\r
-    result = num1 / num2\r
-    id.value = result\r
-    }\r
-  displayText = ""\r
-  }\r
-  else {\r
-  id.value = "Oops! Error!"\r
-  }\r
-}\r
-\r
-// Clear the display\r
-function clearDisplay() {\r
-   id = document.getElementById("display");\r
-\r
-displayText = ""\r
-id.value = ""\r
-}\r
-</script>\r
-\r
-EOT;\r
-$a->page['htmlhead'] .= $x;\r
-}\r
-\r
-function calc_content($app) {\r
-\r
-$o = '';\r
-\r
-$o .=  <<< EOT\r
-\r
-<h3>Calculator</h3>\r
-<br /><br />\r
-<table>\r
-<tbody><tr><td> \r
-<table bgcolor="#af9999" border="1">\r
-<tbody><tr><td>\r
-<table border="1" cellpadding="2" cellspacing="2">\r
-<form name="calc">\r
-<!--\r
-<TR><TD VALIGN=top colspan=6 ALIGN="center"> <H2>Calculator</H2> </TD>\r
--->\r
-<tbody><tr>\r
-       <td colspan="5"><input size="22" id="display" name="display" type="text"></td>\r
-</tr><tr align="left" valign="middle">\r
-       <td><input name="one" value="&nbsp;&nbsp;1&nbsp;&nbsp;&nbsp;" onclick="addDisplay(1)" type="button"></td>\r
-       <td><input name="two" value="&nbsp;&nbsp;2&nbsp;&nbsp;&nbsp;" onclick="addDisplay(2)" type="button"></td>\r
-       <td><input name="three" value="&nbsp;&nbsp;3&nbsp;&nbsp;&nbsp;" onclick="addDisplay(3)" type="button"></td>\r
-       <td><input name="plus" value="&nbsp;&nbsp;+&nbsp;&nbsp;&nbsp;" onclick="addNumbers()" type="button"></td>\r
-</tr><tr align="left" valign="middle">\r
-       <td><input name="four" value="&nbsp;&nbsp;4&nbsp;&nbsp;&nbsp;" onclick="addDisplay(4)" type="button"></td>\r
-       <td><input name="five" value="&nbsp;&nbsp;5&nbsp;&nbsp;&nbsp;" onclick="addDisplay(5)" type="button"></td>\r
-       <td><input name="six" value="&nbsp;&nbsp;6&nbsp;&nbsp;&nbsp;" onclick="addDisplay(6)" type="button"></td>\r
-       <td><input name="minus" value="&nbsp;&nbsp;&nbsp;-&nbsp;&nbsp;&nbsp;" onclick="subtractNumbers()" type="button"></td>\r
-</tr><tr align="left" valign="middle">\r
-       <td><input name="seven" value="&nbsp;&nbsp;7&nbsp;&nbsp;&nbsp;" onclick="addDisplay(7)" type="button"></td>\r
-       <td><input name="eight" value="&nbsp;&nbsp;8&nbsp;&nbsp;&nbsp;" onclick="addDisplay(8)" type="button"></td>\r
-       <td><input name="nine" value="&nbsp;&nbsp;9&nbsp;&nbsp;&nbsp;" onclick="addDisplay(9)" type="button"></td>\r
-       <td><input name="multiplication" value="&nbsp;&nbsp;*&nbsp;&nbsp;&nbsp;&nbsp;" onclick="multiplyNumbers()" type="button"></td>\r
-</tr><tr align="left" valign="middle">\r
-       <td><input name="zero" value="&nbsp;&nbsp;0&nbsp;&nbsp;&nbsp;" onclick="addDisplay(0)" type="button"></td>\r
-       <td><input name="pi" value="&nbsp;Pi&nbsp;&nbsp;" onclick="addDisplay(Math.PI)" type="button"> </td> \r
-       <td><input name="dot" value="&nbsp;&nbsp;&nbsp;.&nbsp;&nbsp;&nbsp;" onclick='addDisplay(".")' type="button"></td>\r
-       <td><input name="division" value="&nbsp;&nbsp;&nbsp;/&nbsp;&nbsp;&nbsp;" onclick="divideNumbers()" type="button"></td>\r
-</tr><tr align="left" valign="middle">\r
-       <td><input name="sqareroot" value="sqrt" onclick="sqrt()" type="button"></td>\r
-       <td><input name="squarex" value=" x^2" onclick="square()" type="button"></td>\r
-       <td><input name="deg-rad" value="d2r&nbsp;" onclick="degToRad()" type="button"></td>\r
-       <td><input name="rad-deg" value="r2d&nbsp;" onclick="radToDeg()" type="button"></td>\r
-</tr><tr align="left" valign="middle">\r
-       <td><input name="sine" value="&nbsp;sin&nbsp;" onclick="sin()" type="button"></td>\r
-       <td><input name="arcsine" value="asin" onclick="arcSin()" type="button"></td>\r
-       <td><input name="cosine" value="cos" onclick="cos()" type="button"></td>\r
-       <td><input name="arccosine" value="acs" onclick="arcCos()" type="button"></td>\r
-\r
-</tr><tr align="left" valign="middle">\r
-       <td colspan="2"><input name="clear" value="&nbsp;&nbsp;Clear&nbsp;&nbsp;" onclick="clearDisplay()" type="button"></td>\r
-       <td colspan="3"><input name="enter" value="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" onclick="calculate()" type="button"></td>\r
-\r
-</tr></tbody></table>\r
-</form>\r
-\r
-       <!--\r
-       <TD VALIGN=top> \r
-               <B>NOTE:</B> All sine and cosine calculations are\r
-               <br>done in radians. Remember to convert first\r
-               <br>if using degrees.\r
-       </TD>\r
-       -->\r
-       \r
-</td></tr></tbody></table>\r
-\r
-\r
-</td></tr></tbody></table>\r
-\r
-EOT;\r
-return $o;\r
-\r
-}\r
+<?php
+/**
+ * Name: Calculator App
+ * Description: Simple Calculator Application
+ * Version: 1.0
+ * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ */
+use Friendica\Core\Hook;
+use Friendica\DI;
+
+function calc_install() {
+       Hook::register('app_menu', 'addon/calc/calc.php', 'calc_app_menu');
+}
+
+function calc_uninstall() {
+       Hook::unregister('app_menu', 'addon/calc/calc.php', 'calc_app_menu');
+
+}
+
+function calc_app_menu($a,&$b) {
+       $b['app_menu'][] = '<div class="app-title"><a href="calc">Calculator</a></div>'; 
+}
+
+
+function calc_module() {}
+
+
+
+
+function calc_init($a) {
+
+$x = <<< EOT
+
+<script language="JavaScript">
+/**************************************
+ * www.FemaleNerd.com         *
+ **************************************/
+
+// Declare global variables
+var displayText = ""
+var num1
+var num2
+var operatorType
+
+// Write to display
+function addDisplay(n){
+   id = document.getElementById("display");
+id.value = ""
+displayText += n
+id.value = displayText
+}
+
+// Addition
+function addNumbers() {
+if (displayText == "") {
+  displayText = result
+ }
+num1 = parseFloat(displayText)
+operatorType = "add"
+displayText = ""
+}
+
+// Subtraction
+function subtractNumbers() {
+if (displayText == "") {
+  displayText = result
+ }
+num1 = parseFloat(displayText)
+operatorType = "subtract"
+displayText = ""
+}
+
+// Multiplication
+function multiplyNumbers() {
+if (displayText == "") {
+  displayText = result
+ }
+num1 = parseFloat(displayText)
+operatorType = "multiply"
+displayText = ""
+}
+
+// Division
+function divideNumbers() {
+if (displayText == "") {
+  displayText = result
+ }
+num1 = parseFloat(displayText)
+operatorType = "divide"
+displayText = ""
+}
+
+// Sine
+function sin() {
+   id = document.getElementById("display");
+if (displayText == "") {
+  num1 = result
+  }
+else {
+  num1 = parseFloat(displayText)
+  }
+if (num1 != "") {
+  result = Math.sin(num1)
+  id.value = result
+  displayText = ""
+  }
+else {
+  alert("Please write the number first")
+  }
+}
+
+// Cosine
+function cos() {
+   id = document.getElementById("display");
+if (displayText == "") {
+  num1 = result
+  }
+else {
+  num1 = parseFloat(displayText)
+  }
+if (num1 != "") {
+  result = Math.cos(num1)
+  id.value = result
+  displayText = ""
+  }
+else {
+  alert("Please write the number first")
+  }
+}
+
+// ArcSine
+function arcSin() {
+   id = document.getElementById("display");
+if (displayText == "") {
+  num1 = result
+  }
+else {
+  num1 = parseFloat(displayText)
+  }
+if (num1 != "") {
+  result = Math.asin(num1)
+  id.value = result
+  displayText = ""
+  }
+else {
+  alert("Please write the number first")
+  }
+}
+
+// ArcCosine
+function arcCos() {
+   id = document.getElementById("display");
+if (displayText == "") {
+  num1 = result
+  }
+else {
+  num1 = parseFloat(displayText)
+  }
+if (num1 != "") {
+  result = Math.acos(num1)
+  id.value = result
+  displayText = ""
+  }
+else {
+  alert("Please write the number first")
+  }
+}
+
+// Square root
+function sqrt() {
+   id = document.getElementById("display");
+if (displayText == "") {
+  num1 = result
+  }
+else {
+  num1 = parseFloat(displayText)
+  }
+if (num1 != "") {
+  result = Math.sqrt(num1)
+  id.value = result
+  displayText = ""
+  }
+else {
+  alert("Please write the number first")
+  }
+}
+
+// Square number (number to the power of two)
+function square() {
+   id = document.getElementById("display");
+if (displayText == "") {
+  num1 = result
+  }
+else {
+  num1 = parseFloat(displayText)
+  }
+if (num1 != "") {
+  result = num1 * num1
+  id.value = result
+  displayText = ""
+  }
+else {
+  alert("Please write the number first")
+  }
+}
+
+// Convert degrees to radians
+function degToRad() {
+   id = document.getElementById("display");
+if (displayText == "") {
+  num1 = result
+  }
+else {
+  num1 = parseFloat(displayText)
+  }
+if (num1 != "") {
+  result = num1 * Math.PI / 180
+  id.value = result
+  displayText = ""
+  }
+else {
+  alert("Please write the number first")
+  }
+}
+
+// Convert radians to degrees
+function radToDeg() {
+   id = document.getElementById("display");
+if (displayText == "") {
+  num1 = result
+  }
+else {
+  num1 = parseFloat(displayText)
+  }
+if (num1 != "") {
+  result = num1 * 180 / Math.PI
+  id.value = result
+  displayText = ""
+  }
+else {
+  alert("Please write the number first")
+  }
+}
+
+// Calculations
+function calculate() {
+   id = document.getElementById("display");
+
+if (displayText != "") {
+  num2 = parseFloat(displayText)
+// Calc: Addition
+  if (operatorType == "add") {
+    result = num1 + num2
+    id.value = result
+    }
+// Calc: Subtraction
+  if (operatorType == "subtract") {
+    result = num1 - num2
+    id.value = result
+    }
+// Calc: Multiplication
+  if (operatorType == "multiply") {
+    result = num1 * num2
+    id.value = result
+    }
+// Calc: Division
+  if (operatorType == "divide") {
+    result = num1 / num2
+    id.value = result
+    }
+  displayText = ""
+  }
+  else {
+  id.value = "Oops! Error!"
+  }
+}
+
+// Clear the display
+function clearDisplay() {
+   id = document.getElementById("display");
+
+displayText = ""
+id.value = ""
+}
+</script>
+
+EOT;
+DI::page()['htmlhead'] .= $x;
+}
+
+function calc_content($app) {
+
+$o = '';
+
+$o .=  <<< EOT
+
+<h3>Calculator</h3>
+<br /><br />
+<table>
+<tbody><tr><td> 
+<table bgcolor="#af9999" border="1">
+<tbody><tr><td>
+<table border="1" cellpadding="2" cellspacing="2">
+<form name="calc">
+<!--
+<TR><TD VALIGN=top colspan=6 ALIGN="center"> <H2>Calculator</H2> </TD>
+-->
+<tbody><tr>
+       <td colspan="5"><input size="22" id="display" name="display" type="text"></td>
+</tr><tr align="left" valign="middle">
+       <td><input name="one" value="&nbsp;&nbsp;1&nbsp;&nbsp;&nbsp;" onclick="addDisplay(1)" type="button"></td>
+       <td><input name="two" value="&nbsp;&nbsp;2&nbsp;&nbsp;&nbsp;" onclick="addDisplay(2)" type="button"></td>
+       <td><input name="three" value="&nbsp;&nbsp;3&nbsp;&nbsp;&nbsp;" onclick="addDisplay(3)" type="button"></td>
+       <td><input name="plus" value="&nbsp;&nbsp;+&nbsp;&nbsp;&nbsp;" onclick="addNumbers()" type="button"></td>
+</tr><tr align="left" valign="middle">
+       <td><input name="four" value="&nbsp;&nbsp;4&nbsp;&nbsp;&nbsp;" onclick="addDisplay(4)" type="button"></td>
+       <td><input name="five" value="&nbsp;&nbsp;5&nbsp;&nbsp;&nbsp;" onclick="addDisplay(5)" type="button"></td>
+       <td><input name="six" value="&nbsp;&nbsp;6&nbsp;&nbsp;&nbsp;" onclick="addDisplay(6)" type="button"></td>
+       <td><input name="minus" value="&nbsp;&nbsp;&nbsp;-&nbsp;&nbsp;&nbsp;" onclick="subtractNumbers()" type="button"></td>
+</tr><tr align="left" valign="middle">
+       <td><input name="seven" value="&nbsp;&nbsp;7&nbsp;&nbsp;&nbsp;" onclick="addDisplay(7)" type="button"></td>
+       <td><input name="eight" value="&nbsp;&nbsp;8&nbsp;&nbsp;&nbsp;" onclick="addDisplay(8)" type="button"></td>
+       <td><input name="nine" value="&nbsp;&nbsp;9&nbsp;&nbsp;&nbsp;" onclick="addDisplay(9)" type="button"></td>
+       <td><input name="multiplication" value="&nbsp;&nbsp;*&nbsp;&nbsp;&nbsp;&nbsp;" onclick="multiplyNumbers()" type="button"></td>
+</tr><tr align="left" valign="middle">
+       <td><input name="zero" value="&nbsp;&nbsp;0&nbsp;&nbsp;&nbsp;" onclick="addDisplay(0)" type="button"></td>
+       <td><input name="pi" value="&nbsp;Pi&nbsp;&nbsp;" onclick="addDisplay(Math.PI)" type="button"> </td> 
+       <td><input name="dot" value="&nbsp;&nbsp;&nbsp;.&nbsp;&nbsp;&nbsp;" onclick='addDisplay(".")' type="button"></td>
+       <td><input name="division" value="&nbsp;&nbsp;&nbsp;/&nbsp;&nbsp;&nbsp;" onclick="divideNumbers()" type="button"></td>
+</tr><tr align="left" valign="middle">
+       <td><input name="sqareroot" value="sqrt" onclick="sqrt()" type="button"></td>
+       <td><input name="squarex" value=" x^2" onclick="square()" type="button"></td>
+       <td><input name="deg-rad" value="d2r&nbsp;" onclick="degToRad()" type="button"></td>
+       <td><input name="rad-deg" value="r2d&nbsp;" onclick="radToDeg()" type="button"></td>
+</tr><tr align="left" valign="middle">
+       <td><input name="sine" value="&nbsp;sin&nbsp;" onclick="sin()" type="button"></td>
+       <td><input name="arcsine" value="asin" onclick="arcSin()" type="button"></td>
+       <td><input name="cosine" value="cos" onclick="cos()" type="button"></td>
+       <td><input name="arccosine" value="acs" onclick="arcCos()" type="button"></td>
+
+</tr><tr align="left" valign="middle">
+       <td colspan="2"><input name="clear" value="&nbsp;&nbsp;Clear&nbsp;&nbsp;" onclick="clearDisplay()" type="button"></td>
+       <td colspan="3"><input name="enter" value="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" onclick="calculate()" type="button"></td>
+
+</tr></tbody></table>
+</form>
+
+       <!--
+       <TD VALIGN=top> 
+               <B>NOTE:</B> All sine and cosine calculations are
+               <br>done in radians. Remember to convert first
+               <br>if using degrees.
+       </TD>
+       -->
+       
+</td></tr></tbody></table>
+
+
+</td></tr></tbody></table>
+
+EOT;
+return $o;
+
+}

diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index dd48e7403cb67b91672189841dbc35fbee8a4607..4e832506469cc925210a394254fde1bb65a4a468 100644 (file)
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -49,7 +49,7 @@ function fromapp_settings(&$a, &$s)
 
        /* Add our stylesheet to the page so we can make our settings look nice */
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/fromapp/fromapp.css' . '" media="all" />' . "\r\n";
+       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/fromapp/fromapp.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/gnot/gnot.php b/gnot/gnot.php
index 46012e5eaeadcb8eddbf2e93c95cd5c3fd12aa69..c89b3aba81b3f2296bb6e02ef5430ae7386bd15a 100644 (file)
--- a/gnot/gnot.php
+++ b/gnot/gnot.php
@@ -70,7 +70,7 @@ function gnot_settings(&$a,&$s) {
 
        /* Add our stylesheet to the page so we can make our settings look nice */
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/gnot/gnot.css' . '" media="all" />' . "\r\n";
+       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/gnot/gnot.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/group_text/group_text.php b/group_text/group_text.php
index 6d14b6f5f851138e2851275bbc8b801a0230f4a3..3e636091fe6fdcbac5b4a35c236c9d58499d3e15 100644 (file)
--- a/group_text/group_text.php
+++ b/group_text/group_text.php
@@ -65,7 +65,7 @@ function group_text_settings(&$a,&$s) {
 
        /* Add our stylesheet to the page so we can make our settings look nice */
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/group_text/group_text.css' . '" media="all" />' . "\r\n";
+       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/group_text/group_text.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index 1ba936a22cbc90d90578351e753d933612c0be1e..f49fa2143554c7bfebd5d2cccb7bcd5f6b9eb769 100644 (file)
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -62,7 +62,7 @@ function ijpost_settings(&$a, &$s)
 
        /* Add our stylesheet to the page so we can make our settings look nice */
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/ijpost/ijpost.css' . '" media="all" />' . "\r\n";
+       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/ijpost/ijpost.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variables */
 

diff --git a/impressum/impressum.php b/impressum/impressum.php
index 0bc4d6e3c748159319ab46b32f6a19e63026111a..190afc2c8f74e8f8b3448eef38943002cd28597a 100644 (file)
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -47,7 +47,7 @@ function impressum_footer($a, &$b) {
     $text = ProxyUtils::proxifyHtml(BBCode::convert(Config::get('impressum','footer_text')));
 
     if (! $text == '') {
-        $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.DI::baseUrl()->get().'/addon/impressum/impressum.css" media="all" />';
+        DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.DI::baseUrl()->get().'/addon/impressum/impressum.css" media="all" />';
         $b .= '<div class="clear"></div>';
         $b .= '<div id="impressum_footer">'.$text.'</div>';
     }

diff --git a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
index 0450a7c734bd7e575433c613a2f24fd16fefb5e0..6a4fbab761f3b0ca07f5f299c7a4ee669234c4a7 100644 (file)
--- a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
+++ b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
@@ -36,7 +36,7 @@ function infiniteimprobabilitydrive_content(&$a)
        $baseurl = DI::baseUrl()->get() . '/addon/infiniteimprobabilitydrive';
        $o = '';
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.DI::baseUrl()->get().'/addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.css"/>';
+       DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.DI::baseUrl()->get().'/addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.css"/>';
 
 
        $baseurl = DI::baseUrl()->get();

diff --git a/irc/irc.php b/irc/irc.php
index d7eaed629265a433aff4ce76a1c06693dc7f87d9..528189eda1139b205de6a1766860b179bd71b127 100644 (file)
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -33,7 +33,7 @@ function irc_addon_settings(&$a,&$s) {
 
     /* Add our stylesheet to the page so we can make our settings look nice */
 
-//     $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/irc/irc.css' . '" media="all" />' . "\r\n";
+//     DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/irc/irc.css' . '" media="all" />' . "\r\n";
 
     /* setting popular channels, auto connect channels */
        $sitechats = PConfig::get( local_user(), 'irc','sitechats'); /* popular channels */
@@ -98,11 +98,11 @@ function irc_content(&$a) {
                $chats = ['friendica','chat','chatback','hottub','ircbar','dateroom','debian'];
 
 
-       $a->page['aside'] .= '<div class="widget"><h3>' . L10n::t('Popular Channels') . '</h3><ul>';
+       DI::page()['aside'] .= '<div class="widget"><h3>' . L10n::t('Popular Channels') . '</h3><ul>';
        foreach($chats as $chat) {
-               $a->page['aside'] .= '<li><a href="' . DI::baseUrl()->get() . '/irc?channels=' . $chat . '" >' . '#' . $chat . '</a></li>';
+               DI::page()['aside'] .= '<li><a href="' . DI::baseUrl()->get() . '/irc?channels=' . $chat . '" >' . '#' . $chat . '</a></li>';
        }
-       $a->page['aside'] .= '</ul></div>';
+       DI::page()['aside'] .= '</ul></div>';
 
         /* setting the channel(s) to auto connect */
        if (local_user()) {

diff --git a/krynn/krynn.php b/krynn/krynn.php
index fe5c197558c2f9a6a843a46715b7eca2bc6ddd8a..2a941580ef4e5a4b05f34ff016a514539d67da54 100644 (file)
--- a/krynn/krynn.php
+++ b/krynn/krynn.php
@@ -143,7 +143,7 @@ function krynn_settings(&$a,&$s) {
 
        /* Add our stylesheet to the page so we can make our settings look nice */
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/krynn/krynn.css' . '" media="all" />' . "\r\n";
+       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/krynn/krynn.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/libertree/libertree.php b/libertree/libertree.php
index 11036d5c913e17a8fb94d14547faf7bd0fc2fdcf..442fa90b558492735cd921d811785f7cdce4e5c8 100644 (file)
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -62,7 +62,7 @@ function libertree_settings(&$a,&$s) {
 
     /* Add our stylesheet to the page so we can make our settings look nice */
 
-    $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/libertree/libertree.css' . '" media="all" />' . "\r\n";
+    DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/libertree/libertree.css' . '" media="all" />' . "\r\n";
 
     /* Get the current state of our config variables */
 

diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index 6d347b278c182618a66d6b21a663a39494aff73b..e8732de66d6d2a17c829df35e53724201e52daae 100644 (file)
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -62,7 +62,7 @@ function ljpost_settings(&$a,&$s) {
 
     /* Add our stylesheet to the page so we can make our settings look nice */
 
-    $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/ljpost/ljpost.css' . '" media="all" />' . "\r\n";
+    DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/ljpost/ljpost.css' . '" media="all" />' . "\r\n";
 
     /* Get the current state of our config variables */
 

diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php
index 1b49a1799d308bb668f79c4c91a4228bd5f6591f..11e8e12e305935277812b776f687f7de501f7440 100644 (file)
--- a/newmemberwidget/newmemberwidget.php
+++ b/newmemberwidget/newmemberwidget.php
@@ -50,7 +50,7 @@ function newmemberwidget_network_mod_init ($a, $b)
        }
 
        $t .= '</div><div class="clear"></div>';
-       $a->page['aside'] = $t . $a->page['aside'];
+       DI::page()['aside'] = $t . DI::page()['aside'];
 }
 
 function newmemberwidget_addon_admin_post(&$a)

diff --git a/notimeline/notimeline.php b/notimeline/notimeline.php
index da9ec6937518c933a57d432c78917a23cf76c94d..ea5521fdf656573c5733a07900e11b2d4de64c95 100644 (file)
--- a/notimeline/notimeline.php
+++ b/notimeline/notimeline.php
@@ -42,7 +42,7 @@ function notimeline_settings(&$a, &$s)
 
        /* Add our stylesheet to the page so we can make our settings look nice */
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/notimeline/notimeline.css' . '" media="all" />' . "\r\n";
+       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/notimeline/notimeline.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 29b95fcb127a50513dbdc933ecba5cc73fc324a6..ba59f007caacaa3d28deba7ff51ed552956f9c6a 100644 (file)
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -66,7 +66,7 @@ function nsfw_addon_settings(&$a, &$s)
 
        /* Add our stylesheet to the page so we can make our settings look nice */
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/nsfw/nsfw.css' . '" media="all" />' . "\r\n";
+       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/nsfw/nsfw.css' . '" media="all" />' . "\r\n";
 
        $enable_checked = (intval(PConfig::get(local_user(), 'nsfw', 'disable')) ? '' : ' checked="checked" ');
        $words = PConfig::get(local_user(), 'nsfw', 'words');

diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php
index bd4f81843dae1f7a0840a788bce2f33cac0d88ad..5fa40e504ba00ae723030e65b4b72d45a7348f5b 100644 (file)
--- a/numfriends/numfriends.php
+++ b/numfriends/numfriends.php
@@ -60,7 +60,7 @@ function numfriends_settings(&$a, &$s)
 
        /* Add our stylesheet to the page so we can make our settings look nice */
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/numfriends/numfriends.css' . '" media="all" />' . "\r\n";
+       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/numfriends/numfriends.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index 1d219c3a6e115c519d1fcaba4282812617c7f990..c2c0a7c9af54d2a9341d77dd0f5cb5dacc0fab34 100644 (file)
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -57,7 +57,7 @@ function openstreetmap_load_config(\Friendica\App $a, ConfigFileLoader $loader)
 function openstreetmap_alterheader($a, &$navHtml)
 {
        $addScriptTag = '<script type="text/javascript" src="' . DI::baseUrl()->get() . '/addon/openstreetmap/openstreetmap.js"></script>' . "\r\n";
-       $a->page['htmlhead'] .= $addScriptTag;
+       DI::page()['htmlhead'] .= $addScriptTag;
 }
 
 /**

diff --git a/piwik/piwik.php b/piwik/piwik.php
index 5d3da5c09ad7f02855c7baf3373141f412618bb6..2076ff7ae1616ec2042c63bd22912000a2ba09d0 100644 (file)
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -66,7 +66,7 @@ function piwik_analytics($a,&$b) {
         *   associated CSS file. We just have to tell Friendica to get it
         *   into the page header.
         */
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/piwik/piwik.css' . '" media="all" />';
+       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/piwik/piwik.css' . '" media="all" />';
 
        /*
         *   Get the configuration variables from the config/addon.config.php file.

diff --git a/planets/planets.php b/planets/planets.php
index 59d0f49a31259c5b61f0ef2bbca9f19a5a2b3a92..2453ffeeb42d4f135485fddaf5d00b9fd4df67eb 100644 (file)
--- a/planets/planets.php
+++ b/planets/planets.php
@@ -140,7 +140,7 @@ function planets_settings(&$a,&$s) {
 
        /* Add our stylesheet to the page so we can make our settings look nice */
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/planets/planets.css' . '" media="all" />' . "\r\n";
+       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/planets/planets.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/qcomment/qcomment.php b/qcomment/qcomment.php
index a411354c5aa0c62742f02298ebb6512ba56822c4..6e2218ecf2045c21a2d920bf954ef28fdbf1a317 100644 (file)
--- a/qcomment/qcomment.php
+++ b/qcomment/qcomment.php
@@ -43,7 +43,7 @@ function qcomment_addon_settings(&$a, &$s)
 
        /* Add our stylesheet to the page so we can make our settings look nice */
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/qcomment/qcomment.css' . '" media="all" />' . "\r\n";
+       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/qcomment/qcomment.css' . '" media="all" />' . "\r\n";
 
        $words = PConfig::get(local_user(), 'qcomment', 'words', L10n::t(':-)') . "\n" . L10n::t(':-(') . "\n" .  L10n::t('lol'));
 

diff --git a/randplace/randplace.php b/randplace/randplace.php
index 65eb013338be03f888245ec55e47ecb15655edc2..af41405f2740108a43804b5ab17d5eedbb784d79 100644 (file)
--- a/randplace/randplace.php
+++ b/randplace/randplace.php
@@ -159,7 +159,7 @@ function randplace_settings(&$a,&$s) {
 
        /* Add our stylesheet to the page so we can make our settings look nice */
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/randplace/randplace.css' . '" media="all" />' . "\r\n";
+       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/randplace/randplace.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/remote_permissions/remote_permissions.php b/remote_permissions/remote_permissions.php
index a985bf37a142d8b9d26fcc06490ba36ebb8a1608..8011d5c38d61f9f7696d2a24ab3178944959c0da 100644 (file)
--- a/remote_permissions/remote_permissions.php
+++ b/remote_permissions/remote_permissions.php
@@ -39,7 +39,7 @@ function remote_permissions_settings(&$a,&$o) {
 
        /* Add our stylesheet to the page so we can make our settings look nice */
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/remote_permissions/settings.css' . '" media="all" />' . "\r\n";
+       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/remote_permissions/settings.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/showmore/showmore.php b/showmore/showmore.php
index 7a446ec870f2268a16d74d1dfa79425911cbb017..dcc9e2f91e84d8c70a68666362e65f3f56a65de2 100644 (file)
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -35,7 +35,7 @@ function showmore_addon_settings(&$a, &$s)
 
        /* Add our stylesheet to the page so we can make our settings look nice */
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.DI::baseUrl()->get().'/addon/showmore/showmore.css'.'" media="all"/>'."\r\n";
+       DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.DI::baseUrl()->get().'/addon/showmore/showmore.css'.'" media="all"/>'."\r\n";
 
        $enable_checked = (intval(PConfig::get(local_user(), 'showmore', 'disable')) ? '' : ' checked="checked"');
        $chars = PConfig::get(local_user(), 'showmore', 'chars', 1100);

diff --git a/startpage/startpage.php b/startpage/startpage.php
index c2ade1d38898e3a6f699f497caa4499da6fe3c99..11633d408c7ce724f9674711a7ca41dd26069f3c 100644 (file)
--- a/startpage/startpage.php
+++ b/startpage/startpage.php
@@ -72,7 +72,7 @@ function startpage_settings(&$a, &$s)
 
        /* Add our stylesheet to the page so we can make our settings look nice */
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/startpage/startpage.css' . '" media="all" />' . "\r\n";
+       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/startpage/startpage.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/superblock/superblock.php b/superblock/superblock.php
index 99f4a4dc237dba242a99b2fb88a43549ed4862e0..aae1b13243150ee8042931e9bff3381666304a0b 100644 (file)
--- a/superblock/superblock.php
+++ b/superblock/superblock.php
@@ -38,7 +38,7 @@ function superblock_addon_settings(&$a, &$s)
 
        /* Add our stylesheet to the page so we can make our settings look nice */
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/superblock/superblock.css' . '" media="all" />' . "\r\n";
+       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/superblock/superblock.css' . '" media="all" />' . "\r\n";
 
        $words = PConfig::get(local_user(), 'system', 'blocked');
        if (!$words) {
@@ -112,7 +112,7 @@ function superblock_conversation_start(&$a, &$b)
        if ($words) {
                $a->data['superblock'] = explode(',', $words);
        }
-       $a->page['htmlhead'] .= <<< EOT
+       DI::page()['htmlhead'] .= <<< EOT
 
 <script>
 function superblockBlock(author) {

diff --git a/viewsrc/viewsrc.php b/viewsrc/viewsrc.php
index d50b4234747ed5562cbd4968558f07e6ed518456..e0b795cc2ac1a5fdf4fa4924f2ad6d6848d8fcbc 100644 (file)
--- a/viewsrc/viewsrc.php
+++ b/viewsrc/viewsrc.php
@@ -25,7 +25,7 @@ function viewsrc_uninstall() {
 }
 
 function viewsrc_page_end(&$a, &$o){
-       $a->page['htmlhead'] .= <<< EOS
+       DI::page()['htmlhead'] .= <<< EOS
        <script>
                $(function(){
                        $('a[href*="/viewsrc/"]').each(function() {

diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php
index 4283ab16f5e9755b93f86b7bf7ef75beb8ec24b3..e74ee635a0b05cf1f61aa5c025b06fd2ea69c69e 100644 (file)
--- a/windowsphonepush/windowsphonepush.php
+++ b/windowsphonepush/windowsphonepush.php
@@ -107,7 +107,7 @@ function windowsphonepush_settings(&$a, &$s)
        }
 
        /* Add our stylesheet to the page so we can make our settings look nice */
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/windowsphonepush/windowsphonepush.css' . '" media="all" />' . "\r\n";
+       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/windowsphonepush/windowsphonepush.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variables */
        $enabled = PConfig::get(local_user(), 'windowsphonepush', 'enable');

diff --git a/wppost/wppost.php b/wppost/wppost.php
index cd3e1cfc9c8c4cd68aa332a2e68735f6194c84b2..81e6efff16ad8d2e346c1ae3cdc02b1ef7830a1e 100644 (file)
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -70,7 +70,7 @@ function wppost_settings(&$a,&$s) {
 
        /* Add our stylesheet to the page so we can make our settings look nice */
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/wppost/wppost.css' . '" media="all" />' . "\r\n";
+       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/wppost/wppost.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variables */