@@ -18,14 +18,8 @@ |
||
18 | 18 | use Facebook\FacebookSession; |
19 | 19 | use Facebook\FacebookRedirectLoginHelper; |
20 | 20 | use Facebook\FacebookRequest; |
21 | -use Facebook\FacebookResponse; |
|
22 | 21 | use Facebook\FacebookSDKException; |
23 | 22 | use Facebook\FacebookRequestException; |
24 | -use Facebook\FacebookAuthorizationException; |
|
25 | -use Facebook\GraphObject; |
|
26 | -use Facebook\Entities\AccessToken; |
|
27 | -use Facebook\HttpClients\FacebookCurlHttpClient; |
|
28 | -use Facebook\HttpClients\FacebookHttpable; |
|
29 | 23 | |
30 | 24 | require_once dirname(__FILE__) . '/functions.inc.php'; |
31 | 25 |
@@ -1,8 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | /* For licensing terms, see /license.txt */ |
3 | 3 | |
4 | -use ChamiloSession as Session; |
|
5 | - |
|
6 | 4 | /** |
7 | 5 | * Class ExerciseLib |
8 | 6 | * shows a question and its answers |
@@ -3,14 +3,8 @@ |
||
3 | 3 | |
4 | 4 | use Ddeboer\DataImport\Writer\ExcelWriter; |
5 | 5 | use Ddeboer\DataImport\Writer\CsvWriter; |
6 | -use Ddeboer\DataImport\Workflow; |
|
7 | - |
|
8 | -use Ddeboer\DataImport\Reader\CsvReader; |
|
9 | -use Ddeboer\DataImport\Reader\ArrayReader; |
|
10 | -use Ddeboer\DataImport\Writer\ArrayWriter; |
|
11 | 6 | use Chamilo\CoreBundle\Component\Editor\Connector; |
12 | 7 | use Chamilo\CoreBundle\Component\Filesystem\Data; |
13 | -use ChamiloSession as Session; |
|
14 | 8 | use MediaAlchemyst\Alchemyst; |
15 | 9 | use MediaAlchemyst\DriversContainer; |
16 | 10 | use Neutron\TemporaryFilesystem\Manager; |
@@ -2,7 +2,6 @@ |
||
2 | 2 | /* For licensing terms, see /license.txt */ |
3 | 3 | |
4 | 4 | use ChamiloSession as Session; |
5 | - |
|
6 | 5 | use Chamilo\UserBundle\Entity\User; |
7 | 6 | |
8 | 7 | /** |
@@ -1,9 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | /* For licensing terms, see /license.txt */ |
3 | 3 | |
4 | -use Chamilo\CoreBundle\Entity\ExtraField as EntityExtraField; |
|
5 | -use Chamilo\UserBundle\Entity\User; |
|
6 | - |
|
7 | 4 | /** |
8 | 5 | * @package chamilo.webservices |
9 | 6 | */ |
@@ -58,19 +58,22 @@ discard block |
||
58 | 58 | list($ip1, $ip2) = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']); |
59 | 59 | $ip = trim($ip1); |
60 | 60 | } |
61 | - if ($debug) |
|
62 | - error_log("ip: $ip"); |
|
61 | + if ($debug) { |
|
62 | + error_log("ip: $ip"); |
|
63 | + } |
|
63 | 64 | // Check if a file that limits access from webservices exists and contains |
64 | 65 | // the restraining check |
65 | 66 | if (is_file('webservice-auth-ip.conf.php')) { |
66 | 67 | include 'webservice-auth-ip.conf.php'; |
67 | - if ($debug) |
|
68 | - error_log("webservice-auth-ip.conf.php file included"); |
|
68 | + if ($debug) { |
|
69 | + error_log("webservice-auth-ip.conf.php file included"); |
|
70 | + } |
|
69 | 71 | if (!empty($ws_auth_ip)) { |
70 | 72 | $check_ip = true; |
71 | 73 | $ip_matches = api_check_ip_in_range($ip, $ws_auth_ip); |
72 | - if ($debug) |
|
73 | - error_log("ip_matches: $ip_matches"); |
|
74 | + if ($debug) { |
|
75 | + error_log("ip_matches: $ip_matches"); |
|
76 | + } |
|
74 | 77 | } |
75 | 78 | } |
76 | 79 | |
@@ -87,8 +90,9 @@ discard block |
||
87 | 90 | |
88 | 91 | $result = api_is_valid_secret_key($secret_key, $security_key); |
89 | 92 | //error_log($secret_key.'-'.$security_key); |
90 | - if ($debug) |
|
91 | - error_log('WSHelperVerifyKey result: '.intval($result)); |
|
93 | + if ($debug) { |
|
94 | + error_log('WSHelperVerifyKey result: '.intval($result)); |
|
95 | + } |
|
92 | 96 | return $result; |
93 | 97 | } |
94 | 98 |
@@ -1,14 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | /* For licensing terms, see /license.txt */ |
3 | 3 | |
4 | -use Chamilo\CoreBundle\Component\Editor\Connector; |
|
5 | 4 | use Chamilo\CoreBundle\Component\Filesystem\Data; |
6 | 5 | use ChamiloSession as Session; |
7 | -use MediaAlchemyst\Alchemyst; |
|
8 | -use MediaAlchemyst\DriversContainer; |
|
9 | -use Neutron\TemporaryFilesystem\Manager; |
|
10 | -use Neutron\TemporaryFilesystem\TemporaryFilesystem; |
|
11 | -use Symfony\Component\Filesystem\Filesystem; |
|
12 | 6 | |
13 | 7 | /** |
14 | 8 | * Class Wiki |
@@ -1878,7 +1878,7 @@ discard block |
||
1878 | 1878 | $email_body = get_lang('DearUser').' '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).',<br /><br />'; |
1879 | 1879 | if($session_id==0){ |
1880 | 1880 | $email_body .= $emailtext.' <strong>'.$_course['name'].' - '.$group_name.'</strong><br /><br /><br />'; |
1881 | - }else{ |
|
1881 | + } else{ |
|
1882 | 1882 | $email_body .= $emailtext.' <strong>'.$_course['name'].' ('.api_get_session_name(api_get_session_id()).') - '.$group_name.'</strong><br /><br /><br />'; |
1883 | 1883 | } |
1884 | 1884 | $email_body .= $email_user_author.' ('.$email_date_changes.')<br /><br /><br />'; |
@@ -2261,8 +2261,7 @@ discard block |
||
2261 | 2261 | s1.reflink = s2.reflink AND |
2262 | 2262 | ".$groupfilter.$condition_session.")"; |
2263 | 2263 | // warning don't use group by reflink because don't return the last version |
2264 | - } |
|
2265 | - else { |
|
2264 | + } else { |
|
2266 | 2265 | $sql = " SELECT * FROM ".$tbl_wiki." s1 |
2267 | 2266 | WHERE |
2268 | 2267 | s1.c_id = $course_id AND |
@@ -3696,8 +3695,7 @@ discard block |
||
3696 | 3695 | '.api_htmlentities($obj->title).'</a>'; |
3697 | 3696 | if ($obj->user_id <>0) { |
3698 | 3697 | $row[] = UserManager::getUserProfileLink($userinfo); |
3699 | - } |
|
3700 | - else { |
|
3698 | + } else { |
|
3701 | 3699 | $row[] = get_lang('Anonymous').' ('.api_htmlentities($obj->user_ip).')'; |
3702 | 3700 | } |
3703 | 3701 | $row[] = api_get_local_time($obj->dtime, null, date_default_timezone_get()); |
@@ -3932,8 +3930,7 @@ discard block |
||
3932 | 3930 | api_htmlentities($obj->title).'</a>'; |
3933 | 3931 | if ($obj->user_id <>0) { |
3934 | 3932 | $row[] = UserManager::getUserProfileLink($userinfo); |
3935 | - } |
|
3936 | - else { |
|
3933 | + } else { |
|
3937 | 3934 | $row[] = get_lang('Anonymous').' ('.$obj->user_ip.')'; |
3938 | 3935 | } |
3939 | 3936 | $row[] = $year.'-'.$month.'-'.$day.' '.$hours.":".$minutes.":".$seconds; |
@@ -1,7 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | /* For licensing terms, see /license.txt */ |
3 | 3 | |
4 | -use ChamiloSession as Session; |
|
5 | 4 | use Symfony\Component\Finder\Finder; |
6 | 5 | |
7 | 6 | require_once '../inc/global.inc.php'; |
@@ -8,7 +8,6 @@ |
||
8 | 8 | use Chamilo\UserBundle\Entity\User; |
9 | 9 | use MediaAlchemyst\Alchemyst; |
10 | 10 | use Sunra\PhpSimple\HtmlDomParser; |
11 | -use Symfony\Component\Console; |
|
12 | 11 | use Symfony\Component\Console\Output\OutputInterface; |
13 | 12 | use Symfony\Component\Filesystem\Filesystem; |
14 | 13 | use Symfony\Component\Finder\Finder; |
@@ -3,11 +3,9 @@ |
||
3 | 3 | |
4 | 4 | namespace Chamilo\CoreBundle\Entity\Listener; |
5 | 5 | |
6 | -use Chamilo\CoreBundle\Entity\Tool; |
|
7 | 6 | use Chamilo\CourseBundle\ToolChain; |
8 | 7 | use Doctrine\ORM\Event\LifecycleEventArgs; |
9 | 8 | use Chamilo\CoreBundle\Entity\Course; |
10 | -use Doctrine\ORM\Mapping as ORM; |
|
11 | 9 | |
12 | 10 | /** |
13 | 11 | * Class CourseListener |