diff options
| -rw-r--r-- | Zotlabs/Update/_1208.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Update/_1209.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Update/_1211.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Widget/Tasklist.php | 2 | ||||
| -rw-r--r-- | doc/context/fr/apps/help.html | 7 | ||||
| -rw-r--r-- | include/network.php | 36 |
6 files changed, 23 insertions, 28 deletions
diff --git a/Zotlabs/Update/_1208.php b/Zotlabs/Update/_1208.php index 4cbcf4322..840252694 100644 --- a/Zotlabs/Update/_1208.php +++ b/Zotlabs/Update/_1208.php @@ -8,7 +8,7 @@ class _1208 { if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) { $r1 = q("ALTER TABLE poll ADD poll_author text NOT NULL"); - $r2 = q("create index \"poll_author_idx\" on poll \"poll_author\""); + $r2 = q("create index \"poll_author_idx\" on poll (\"poll_author\") "); $r = ($r1 && $r2); } diff --git a/Zotlabs/Update/_1209.php b/Zotlabs/Update/_1209.php index 5ec449395..dc95c3166 100644 --- a/Zotlabs/Update/_1209.php +++ b/Zotlabs/Update/_1209.php @@ -8,7 +8,7 @@ class _1209 { if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) { $r1 = q("ALTER TABLE poll_elm ADD pelm_order numeric(6) NOT NULL DEFAULT '0' "); - $r2 = q("create index \"pelm_order_idx\" on poll_elm \"pelm_order\""); + $r2 = q("create index \"pelm_order_idx\" on poll_elm (\"pelm_order\")"); $r = ($r1 && $r2); } diff --git a/Zotlabs/Update/_1211.php b/Zotlabs/Update/_1211.php index 739a5670d..7068ecbd3 100644 --- a/Zotlabs/Update/_1211.php +++ b/Zotlabs/Update/_1211.php @@ -8,7 +8,7 @@ class _1211 { if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) { $r1 = q("ALTER TABLE channel ADD channel_active timestamp NOT NULL DEFAULT '0001-01-01 00:00:00' "); - $r2 = q("create index \"channel_active\" on channel_active \"channel_active\""); + $r2 = q("create index \"channel_active\" on channel_active (\"channel_active\")"); $r = ($r1 && $r2); } diff --git a/Zotlabs/Widget/Tasklist.php b/Zotlabs/Widget/Tasklist.php index 3961eecce..56342bd17 100644 --- a/Zotlabs/Widget/Tasklist.php +++ b/Zotlabs/Widget/Tasklist.php @@ -21,7 +21,7 @@ class Tasklist { </script>'; $o .= '<div class="widget">' . '<h3>' . t('Tasks') . '</h3><div class="tasklist-tasks">'; - $o .= '</div><form id="tasklist-new-form" action="" ><input id="tasklist-new-summary" type="text" name="summary" value="" /></form>'; + $o .= '</div><form id="tasklist-new-form" action="" ><input class="form-control" id="tasklist-new-summary" type="text" name="summary" value="" /></form>'; $o .= '</div>'; return $o; diff --git a/doc/context/fr/apps/help.html b/doc/context/fr/apps/help.html new file mode 100644 index 000000000..65eb63d84 --- /dev/null +++ b/doc/context/fr/apps/help.html @@ -0,0 +1,7 @@ +<dl class="dl-horizontal"> + <dt>Informations de base</dt> + <dd>Cette page vous montre quelles applications sont disponibles pour votre canal, y compris les applications centrales et celles fournies par les greffons. Pour ajouter une application au <a href='#' onclick='contextualHelpFocus("#app-menu", 1); return false;' title="Cliquez pour ouvrir...">menu de l'application</a>, cliquez sur le bouton étoile l'application dans la liste ci-dessous.</dd> + <dt>Gérer les applications</dt> + <dd>Appuyez sur le bouton «Gérer les applications» pour ouvrir une page où vous pouvez éditer le nom, les catégories et autres propriétés de vos applications. + </dd> +</dl> diff --git a/include/network.php b/include/network.php index c41d87af0..8b7490a8a 100644 --- a/include/network.php +++ b/include/network.php @@ -368,27 +368,6 @@ function z_post_url($url, $params, $redirects = 0, $opts = array()) { return($ret); } -/** - * @brief Like z_post_url() but with an application/json HTTP header. - * - * Add a "Content-Type: application/json" HTTP-header to $opts and call z_post_url(). - * - * @see z_post_url() - * - * @param string $url - * @param array $params - * @param number $redirects default 0 - * @param array $opts (optional) curl options - * @return z_post_url() - */ -function z_post_url_json($url, $params, $redirects = 0, $opts = array()) { - - $opts = array_merge($opts, array('headers' => array('Content-Type: application/json'))); - - return z_post_url($url,json_encode($params),$redirects,$opts); -} - - function json_return_and_die($x, $content_type = 'application/json') { header("Content-type: $content_type"); echo json_encode($x); @@ -669,6 +648,7 @@ function parse_xml_string($s, $strict = true) { libxml_use_internal_errors(true); + $x = @simplexml_load_string($s2); if($x === false) { logger('libxml: parse: error: ' . $s2, LOGGER_DATA); @@ -682,6 +662,16 @@ function parse_xml_string($s, $strict = true) { return $x; } + +function sxml2array ( $xmlObject, $out = array () ) +{ + foreach ( (array) $xmlObject as $index => $node ) + $out[$index] = ( is_object ( $node ) ) ? sxml2array ( $node ) : $node; + + return $out; +} + + /** * @brief Scales an external image. * @@ -779,7 +769,7 @@ function scale_external_images($s, $include_link = true, $scale_replace = false) * @brief xml2array() will convert the given XML text to an array in the XML structure. * * Link: http://www.bin-co.com/php/scripts/xml2array/ - * Portions significantly re-written by mike@macgirvin.com for Friendica + * Portions significantly re-written by mike@macgirvin.com * (namespaces, lowercase tags, get_attribute default changed, more...) * * Examples: $array = xml2array(file_get_contents('feed.xml')); @@ -1160,8 +1150,6 @@ function discover_by_webbie($webbie, $protocol = '') { $network = null; -// $webbie = strtolower($webbie); - $x = webfinger_rfc7033($webbie, true); if($x && array_key_exists('links',$x) && $x['links']) { foreach($x['links'] as $link) { |