From 59b45f7fc12027c387f04a2121ea398c1d534626 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 31 Mar 2012 16:28:39 +0200 Subject: Several improvements --- include/bbcode.php | 3 ++- include/html2plain.php | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index 9befbd0f7..3697f1fc5 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -230,7 +230,8 @@ function bbcode($Text,$preserve_nl = false) { $Text); // [img=widthxheight]image source[/img] - $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '', $Text); + //$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '', $Text); + $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '', $Text); // Images // [img]pathtoimage[/img] diff --git a/include/html2plain.php b/include/html2plain.php index fe0e3326e..7aa20500a 100644 --- a/include/html2plain.php +++ b/include/html2plain.php @@ -83,12 +83,15 @@ function collecturls($message) { $urls = array(); foreach ($result as $treffer) { // A list of some links that should be ignored - $list = array("/user/", "/tag/", "/profile/", "/search?search=", "mailto:", "/u/", "/node/", + $list = array("/user/", "/tag/", "/group/", "/profile/", "/search?search=", "mailto:", "/u/", "/node/", "//facebook.com/profile.php?id=", "//plus.google.com/"); foreach ($list as $listitem) if (strpos($treffer[1], $listitem) !== false) $ignore = true; + if ((strpos($treffer[1], "//plus.google.com/") !== false) and (strpos($treffer[1], "/posts") !== false)) + $ignore = false; + if (!$ignore) $urls[$treffer[1]] = $treffer[1]; } -- cgit v1.2.3 From 4cf1e5aa21b3bcfac25d5ab95a2abccca48de523 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 1 Apr 2012 20:52:33 +0200 Subject: poller: An optional lockfile is used to check if the poller is already running --- htconfig.php | 5 ++++- include/poller.php | 10 ++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/htconfig.php b/htconfig.php index 9d9c8a2c7..63a40c809 100755 --- a/htconfig.php +++ b/htconfig.php @@ -83,5 +83,8 @@ $a->config['system']['no_regfullname'] = true; // If set to true the priority settings of ostatus contacts are used $a->config['system']['ostatus_use_priority'] = false; -// If enabled all items are cached in the given directory +// If enabled, all items are cached in the given directory $a->config['system']['itemcache'] = ""; + +// If enabled, the lockpath is used for a lockfile to check if the poller is running +$a->config['system']['lockpath'] = ""; diff --git a/include/poller.php b/include/poller.php index 90a97867c..499483d00 100755 --- a/include/poller.php +++ b/include/poller.php @@ -25,10 +25,20 @@ function poller_run($argv, $argc){ require_once('include/Contact.php'); require_once('include/email.php'); require_once('include/socgraph.php'); + require_once('include/pidfile.php'); load_config('config'); load_config('system'); + $lockpath = get_config('system','lockpath'); + if ($lockpath != '') { + $pidfile = new pidfile($lockpath, 'poller.lck'); + if($pidfile->is_already_running()) { + logger("poller: Already running"); + exit; + } + } + $a->set_baseurl(get_config('system','url')); load_hooks(); -- cgit v1.2.3 From 5409825fe7edd926f9588057074e62c86f177f1f Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 1 Apr 2012 20:56:27 +0200 Subject: New script that checks if a script is running --- include/pidfile.php | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 include/pidfile.php diff --git a/include/pidfile.php b/include/pidfile.php new file mode 100644 index 000000000..47df8d1f4 --- /dev/null +++ b/include/pidfile.php @@ -0,0 +1,32 @@ +_file = "$dir/$name.pid"; + + if (file_exists($this->_file)) { + $pid = trim(file_get_contents($this->_file)); + if (posix_kill($pid, 0)) { + $this->_running = true; + } + } + + if (! $this->_running) { + $pid = getmypid(); + file_put_contents($this->_file, $pid); + } + } + + public function __destruct() { + if ((! $this->_running) && file_exists($this->_file)) { + unlink($this->_file); + } + } + + public function is_already_running() { + return $this->_running; + } +} +?> -- cgit v1.2.3 From a39d8d3f02e5bbd711fde71594c2c787b21ef2e9 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 2 Apr 2012 00:08:49 +0200 Subject: The "vier"-theme is now working again. But there is still work needed --- view/theme/diabook/style-network.css | 2 +- view/theme/diabook/style-profile.css | 2 +- view/theme/diabook/style-settings.css | 2 +- view/theme/diabook/style.css | 2 +- view/theme/vier/style.css | 68 +++++++++++++++++++++++++++++++---- 5 files changed, 66 insertions(+), 10 deletions(-) diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index 3042476d8..282b37161 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -2523,4 +2523,4 @@ list-style-type: disc; #photos-upload-newalbum-div { float: left; width: 175px; -} \ No newline at end of file +} diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index 5a91e5254..5492c1884 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -2517,4 +2517,4 @@ list-style-type: disc; #photos-upload-newalbum-div { float: left; width: 175px; -} \ No newline at end of file +} diff --git a/view/theme/diabook/style-settings.css b/view/theme/diabook/style-settings.css index 46f7e957e..2a21795a7 100644 --- a/view/theme/diabook/style-settings.css +++ b/view/theme/diabook/style-settings.css @@ -2516,4 +2516,4 @@ list-style-type: disc; #photos-upload-newalbum-div { float: left; width: 175px; -} \ No newline at end of file +} diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 956667faa..d96d9d989 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -2448,4 +2448,4 @@ list-style-type: disc; #photos-upload-newalbum-div { float: left; width: 175px; -} \ No newline at end of file +} diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 39f4ffea4..13b648d5c 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -108,6 +108,7 @@ .tools { background-position: -50px -40px;} .lock { background-position: -70px -40px;} +.unlock { background-position: -90px -40px;} .video { background-position: -110px -40px;} .youtube { background-position: -130px -40px;} @@ -139,8 +140,8 @@ .icon { display: block; - width: 20px; - height: 20px; + width: 18px; + height: 18px; background-image: url('icons.png'); } @@ -415,17 +416,21 @@ code { background: #EEE; } .tool .label { - float: left; +/* float: left; */ } .tool .action { float: right; } .tool a { - color: #000; +/* color: #000; */ } .tool a:hover { - text-decoration: none; + text-decoration: underline; +} +.sidebar-group-element { +/* color: #000; */ } + /* popup notifications */ div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; @@ -1244,7 +1249,8 @@ section { #jot #jot-tools li.loading img { margin-top: 10px; } -#jot #jot-title { +/* #jot */ +#jot-title { border: 0px; margin: 0px; height: 20px; @@ -1272,6 +1278,56 @@ section { line-height: 20px; padding-right: 20px; } + +#profile-jot-submit { + float: right; + margin-left: 15px; +} +#profile-upload-wrapper { + float: left; + margin-left: 15px; +} +#profile-attach-wrapper { + float: left; + margin-left: 15px; +} +#profile-link-wrapper { + float: left; + margin-left: 15px; +} +#profile-video-wrapper { + float: left; + margin-left: 15px; +} +#profile-audio-wrapper { + float: left; + margin-left: 15px; +} +#profile-location-wrapper { + float: left; + margin-left: 15px; +} +#profile-nolocation-wrapper { + float: left; + margin-left: 15px; +} +#jot-perms-icon { + float: right; + margin-left: 15px; +} +#jot-preview-link { + float: right; +} +#profile-jot-end { + clear: both; +} +#profile-jot-text_tbl { + width: 800px; +} +#profile-jot-wrapper { + margin-bottom: 20px; +} + /** buttons **/ /*input[type="submit"] { border: 0px; -- cgit v1.2.3 From 81dfb61f930005f0f65b1f72935c10edc247a985 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 2 Apr 2012 22:36:05 +0200 Subject: API: template for test function added --- view/api_test_xml.tpl | 1 + 1 file changed, 1 insertion(+) create mode 100644 view/api_test_xml.tpl diff --git a/view/api_test_xml.tpl b/view/api_test_xml.tpl new file mode 100644 index 000000000..7509a2dc1 --- /dev/null +++ b/view/api_test_xml.tpl @@ -0,0 +1 @@ +$ok -- cgit v1.2.3 From 7308dbae282194356c2e95936aecc15ea059f356 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 7 Apr 2012 01:19:07 +0200 Subject: "vier": Bookmarks now look better. --- view/theme/vier/nav.tpl | 0 view/theme/vier/style.css | 10 ++++++++++ 2 files changed, 10 insertions(+) mode change 100755 => 100644 view/theme/vier/nav.tpl diff --git a/view/theme/vier/nav.tpl b/view/theme/vier/nav.tpl old mode 100755 new mode 100644 diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 13b648d5c..d8f012c4d 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -609,6 +609,10 @@ nav #nav-apps-link.selected { padding: 5px 10px; */ } +.notify-seen { + background: none repeat scroll 0 0 #DDDDDD; + } + ul.menu-popup { position: absolute; display: none; @@ -1641,6 +1645,12 @@ blockquote { border-left: 1px solid #D2D2D2; padding-left: 9px; margin: 0 0 0 .8ex; + color: #777; +} + +.oembed { + font-size: large; + font-weight: bold; } /* ================== */ -- cgit v1.2.3 From 17d097124cd666608292da00aa91db0a98d5a38f Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 7 Apr 2012 18:35:37 +0200 Subject: "vier": Some design stuff --- view/theme/vier/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index d8f012c4d..d8130e59f 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -979,6 +979,7 @@ section { margin-bottom: 1px; } .wall-item-container .wall-item-actions-social a { + float: left; margin-right: 1em; } .wall-item-container .wall-item-actions-tools { -- cgit v1.2.3 From cb4c7cdb3ef8027d17682c9cb7a29906f0508c80 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 8 Apr 2012 00:02:25 +0200 Subject: API: API is now enhanced. mentions, repeat and destroy now works. --- include/api.php | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 142 insertions(+), 9 deletions(-) diff --git a/include/api.php b/include/api.php index 065f14cff..968a64a6d 100644 --- a/include/api.php +++ b/include/api.php @@ -784,8 +784,145 @@ } api_register_func('api/statuses/show','api_statuses_show', true); - //api_register_func('api/statuses/mentions','api_statuses_mentions', true); - //api_register_func('api/statuses/replies','api_statuses_mentions', true); + + /** + * + */ + function api_statuses_repeat(&$a, $type){ + if (local_user()===false) return false; + + $user_info = api_get_user($a); + + // params + $id = intval($a->argv[3]); + + logger('API: api_statuses_repeat: '.$id); + + //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false); + + $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`nick` as `reply_author`, + `contact`.`name`, `contact`.`photo`, `contact`.`url` as `reply_url`, `contact`.`rel`, + `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, + `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` + FROM `item`, `contact` + WHERE `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0 + AND `contact`.`id` = `item`.`contact-id` + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + $sql_extra + AND `item`.`id`=%d", + intval($id) + ); + + $_REQUEST['body'] = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')."[url=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/url] \n".$r[0]['body']; + $_REQUEST['profile_uid'] = local_user(); + $_REQUEST['type'] = 'wall'; + $_REQUEST['api_source'] = true; + + require_once('mod/item.php'); + item_post($a); + + if ($type == 'xml') + $ok = "true"; + else + $ok = "ok"; + + return api_apply_template('test', $type, array('$ok' => $ok)); + } + api_register_func('api/statuses/retweet','api_statuses_repeat', true); + + /** + * + */ + function api_statuses_destroy(&$a, $type){ + if (local_user()===false) return false; + + $user_info = api_get_user($a); + + // params + $id = intval($a->argv[3]); + + logger('API: api_statuses_destroy: '.$id); + + require_once('include/items.php'); + drop_item($id, false); + + if ($type == 'xml') + $ok = "true"; + else + $ok = "ok"; + + return api_apply_template('test', $type, array('$ok' => $ok)); + } + api_register_func('api/statuses/destroy','api_statuses_destroy', true); + + /** + * + * http://developer.twitter.com/doc/get/statuses/mentions + * + */ + function api_statuses_mentions(&$a, $type){ + if (local_user()===false) return false; + + $user_info = api_get_user($a); + // get last newtork messages + + + // params + $count = (x($_REQUEST,'count')?$_REQUEST['count']:20); + $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); + if ($page<0) $page=0; + $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); + $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0); + //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); + + $start = $page*$count; + + //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false); + + $myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname']; + $myurl = substr($myurl,strpos($myurl,'://')+3); + $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); + $diasp_url = str_replace('/profile/','/u/',$myurl); + $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` regexp '%s' or `tag` regexp '%s' or tag regexp '%s' )) ", + dbesc($myurl . '$'), + dbesc($myurl . '\\]'), + dbesc($diasp_url . '\\]') + ); + + if ($max_id > 0) + $sql_extra .= ' AND `item`.`id` <= '.intval($max_id); + + $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, + `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, + `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, + `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` + FROM `item`, `contact` + WHERE `item`.`uid` = %d + AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0 + AND `contact`.`id` = `item`.`contact-id` + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + $sql_extra + AND `item`.`id`>%d + ORDER BY `item`.`received` DESC LIMIT %d ,%d ", + intval($user_info['uid']), + intval($since_id), + intval($start), intval($count) + ); + + $ret = api_format_items($r,$user_info); + + + $data = array('$statuses' => $ret); + switch($type){ + case "atom": + case "rss": + $data = api_rss_extra($a, $data, $user_info); + } + + return api_apply_template("timeline", $type, $data); + } + api_register_func('api/statuses/mentions','api_statuses_mentions', true); + api_register_func('api/statuses/replies','api_statuses_mentions', true); function api_statuses_user_timeline(&$a, $type){ @@ -1309,12 +1446,11 @@ /* Not implemented by now: +favorites +favorites/create +favorites/destroy statuses/public_timeline -statuses/mentions -statuses/replies statuses/retweets_of_me -statuses/destroy -statuses/retweet friendships/create friendships/destroy friendships/exists @@ -1322,9 +1458,6 @@ friendships/show account/update_location account/update_profile_background_image account/update_profile_image -favorites -favorites/create -favorites/destroy blocks/create blocks/destroy oauth/authorize -- cgit v1.2.3 From 3afc9915e35ba8a8f34dd3cc2dfb5b6e79844122 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Apr 2012 05:24:11 -0700 Subject: rev updates --- boot.php | 2 +- util/messages.po | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index 576cad6b6..45ac155b9 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1304' ); +define ( 'FRIENDICA_VERSION', '2.3.1305' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1137 ); diff --git a/util/messages.po b/util/messages.po index 0cb9d094d..f68d1541b 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1304\n" +"Project-Id-Version: 2.3.1305\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-06 10:00-0700\n" +"POT-Creation-Date: 2012-04-07 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -- cgit v1.2.3 From 741a5dba578444e5fea547a87c48824a69c39840 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Apr 2012 05:52:00 -0700 Subject: provide theme_init() functions --- boot.php | 1 + index.php | 5 +++++ view/theme/darkzero-NS/theme.php | 2 ++ view/theme/darkzero/theme.php | 2 ++ view/theme/duepuntozero/theme.php | 2 ++ view/theme/greenzero/theme.php | 2 ++ view/theme/purplezero/theme.php | 2 ++ view/theme/slack-NS/theme.php | 2 ++ view/theme/slackr/theme.php | 2 ++ 9 files changed, 20 insertions(+) diff --git a/boot.php b/boot.php index 45ac155b9..b1c378d34 100644 --- a/boot.php +++ b/boot.php @@ -922,6 +922,7 @@ function profile_load(&$a, $nickname, $profile = 0) { /** * load/reload current theme info */ + $theme_info_file = "view/theme/".current_theme()."/theme.php"; if (file_exists($theme_info_file)){ require_once($theme_info_file); diff --git a/index.php b/index.php index e7227962f..69c224c1a 100644 --- a/index.php +++ b/index.php @@ -258,6 +258,11 @@ if($a->module_loaded) { $func($a); } + if(function_exists(str_replace('-','_',current_theme()) . '_init')) { + $func = str_replace('-','_',current_theme()) . '_init'; + $func($a); + } + if(($_SERVER['REQUEST_METHOD'] === 'POST') && (! $a->error) && (function_exists($a->module . '_post')) && (! x($_POST,'auth-params'))) { diff --git a/view/theme/darkzero-NS/theme.php b/view/theme/darkzero-NS/theme.php index 2d3e4fd56..6c1aa7f12 100644 --- a/view/theme/darkzero-NS/theme.php +++ b/view/theme/darkzero-NS/theme.php @@ -11,6 +11,7 @@ $a->theme_info = array( 'extends' => 'duepuntozero', ); +function darkzero_NS_init(&$a) { $a->page['htmlhead'] .= <<< EOT EOT; +} \ No newline at end of file diff --git a/view/theme/darkzero/theme.php b/view/theme/darkzero/theme.php index 8c4d3e9ac..bbba3ef74 100644 --- a/view/theme/darkzero/theme.php +++ b/view/theme/darkzero/theme.php @@ -12,6 +12,7 @@ $a->theme_info = array( 'extends' => 'duepuntozero', ); +function darkzero_init(&$a) { $a->page['htmlhead'] .= <<< EOT EOT; +} \ No newline at end of file diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php index 701fb1349..7b42088e1 100644 --- a/view/theme/duepuntozero/theme.php +++ b/view/theme/duepuntozero/theme.php @@ -1,6 +1,7 @@ theme_info = array(); +function duepuntozero_init(&$a) { $a->page['htmlhead'] .= <<< EOT EOT; +} diff --git a/view/theme/greenzero/theme.php b/view/theme/greenzero/theme.php index ceec4dd97..c80202475 100644 --- a/view/theme/greenzero/theme.php +++ b/view/theme/greenzero/theme.php @@ -3,6 +3,7 @@ $a->theme_info = array( 'extends' => 'duepuntozero', ); +function greenzero_init(&$a) { $a->page['htmlhead'] .= <<< EOT EOT; +} \ No newline at end of file diff --git a/view/theme/purplezero/theme.php b/view/theme/purplezero/theme.php index ceec4dd97..b9613027c 100644 --- a/view/theme/purplezero/theme.php +++ b/view/theme/purplezero/theme.php @@ -3,6 +3,7 @@ $a->theme_info = array( 'extends' => 'duepuntozero', ); +function purplezero_init(&$a) { $a->page['htmlhead'] .= <<< EOT EOT; +} \ No newline at end of file diff --git a/view/theme/slack-NS/theme.php b/view/theme/slack-NS/theme.php index ceec4dd97..a8934d03b 100644 --- a/view/theme/slack-NS/theme.php +++ b/view/theme/slack-NS/theme.php @@ -3,6 +3,7 @@ $a->theme_info = array( 'extends' => 'duepuntozero', ); +function slack_NS_init(&$a) { $a->page['htmlhead'] .= <<< EOT EOT; +} \ No newline at end of file diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/theme.php index ceec4dd97..78f5d40f0 100644 --- a/view/theme/slackr/theme.php +++ b/view/theme/slackr/theme.php @@ -3,6 +3,7 @@ $a->theme_info = array( 'extends' => 'duepuntozero', ); +function slackr_init(&$a) { $a->page['htmlhead'] .= <<< EOT EOT; +} \ No newline at end of file -- cgit v1.2.3 From 5c0446975516f2b52b6cf51618e0b75af56de71b Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Apr 2012 06:20:57 -0700 Subject: prepare for using a master theme_init() --- index.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/index.php b/index.php index 69c224c1a..1cb16778a 100644 --- a/index.php +++ b/index.php @@ -262,6 +262,13 @@ if($a->module_loaded) { $func = str_replace('-','_',current_theme()) . '_init'; $func($a); } +// elseif (x($a->theme_info,"extends") && file_exists("view/theme/".$a->theme_info["extends"]."/theme.php")) { +// require_once("view/theme/".$a->theme_info["extends"]."/theme.php"); +// if(function_exists(str_replace('-','_',$a->theme_info["extends"]) . '_init')) { +// $func = str_replace('-','_',$a->theme_info["extends"]) . '_init'; +// $func($a); +// } +// } if(($_SERVER['REQUEST_METHOD'] === 'POST') && (! $a->error) && (function_exists($a->module . '_post')) -- cgit v1.2.3