Merge pull request #1285 from annando/1501-enhanced-poco

"location" and "about" for contacts, improved suggestions, improved contacts exchange

diff --git a/util/typo.php b/util/typo.php
index a8055c84184317ba3d51f564938f959b38b93211..0e2177c706654a514a1920c39779e6704f984c2a 100644 (file)
--- a/util/typo.php
+++ b/util/typo.php
@@ -12,25 +12,28 @@
        
        $a = new App();
 
+       if(x($a->config,'php_path'))
+               $phpath = $a->config['php_path'];
+       else
+               $phpath = 'php';
+
+
        echo "Directory: mod\n";
        $files = glob('mod/*.php');
        foreach($files as $file) {
-               echo $file . "\n";
-               include_once($file);
+        passthru("$phpath -l $file", $ret); $ret===0 or die();
        }
 
        echo "Directory: include\n";
        $files = glob('include/*.php');
        foreach($files as $file) {
-               echo $file . "\n";
-               include_once($file);
+        passthru("$phpath -l $file", $ret); $ret===0 or die();
        }
     
     echo "Directory: object\n";
        $files = glob('object/*.php');
        foreach($files as $file) {
-               echo $file . "\n";
-               include_once($file);
+        passthru("$phpath -l $file", $ret); $ret===0 or die();
        }
 
        echo "Directory: addon\n";
@@ -40,26 +43,17 @@
                $addon = basename($dir);
                $files = glob($dir . '/' . $addon . '.php');
                foreach($files as $file) {
-                       echo $file . "\n";
-                       include_once($file);
+            passthru("$phpath -l $file", $ret); $ret===0 or die();
                }
        }
 
-       if(x($a->config,'php_path'))
-               $phpath = $a->config['php_path'];
-       else
-               $phpath = 'php';
 
        echo "String files\n";
 
        echo 'util/strings.php' . "\n";
-       include_once('util/strings.php');
-       echo count($a->strings) . ' strings' . "\n";
+    passthru("$phpath -l util/strings.php", $ret); $ret===0 or die();
 
        $files = glob('view/*/strings.php');
-
        foreach($files as $file) {
-               echo $file . "\n";
-       passthru($phpath . ' util/typohelper.php ' . $file);
-//             include_once($file);
+        passthru("$phpath -l $file", $ret); $ret===0 or die();
        }

diff --git a/util/typohelper.php b/util/typohelper.php
deleted file mode 100644 (file)
index 589702a..0000000
--- a/util/typohelper.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$str = <<< EOT
-       error_reporting(E_ERROR | E_WARNING | E_PARSE );
-       ini_set('display_errors', '1');
-       ini_set('log_errors','0');
-EOT;
-
-       $str .= str_replace('<?php', '', file_get_contents($argv[1]));
-       
-       eval($str);

diff --git a/view/theme/quattro/templates/wall_thread.tpl b/view/theme/quattro/templates/wall_thread.tpl
index caeee83d26235a2f6b38f31b3b3ec6a4c1d8a284..64e3794ccb5c30eee3bb30cedd7da1ad7606830b 100644 (file)
--- a/view/theme/quattro/templates/wall_thread.tpl
+++ b/view/theme/quattro/templates/wall_thread.tpl
@@ -94,6 +94,10 @@
                                <a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do}}">{{$item.star.do}}</a>
                                <a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo}}">{{$item.star.undo}}</a>
                        {{/if}}
+                       {{if $item.ignore}}
+                           <a href="#" id="ignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;" class="{{$item.ignore.classdo}}" title="{{$item.ignore.do}}">{{$item.ignore.do}}</a>
+                           <a href="#" id="unignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;" class="{{$item.ignore.classundo}}" title="{{$item.ignore.undo}}">{{$item.ignore.undo}}</a>
+                       {{/if}}
                        {{if $item.tagger}}
                                <a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.tagger.class}}" title="{{$item.tagger.add}}">{{$item.tagger.add}}</a>
                        {{/if}}